diff --git a/app/components/container/container.html b/app/components/container/container.html
index 9f45e92fc..ee9bd2629 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -12,7 +12,7 @@
             Container:
             <input type="text" ng-model="container.newContainerName">
             <button class="btn btn-success"
-                    ng-click="renameContainer()">Edit
+                    ng-click="renameContainer()">Save
             </button>
             <button class="btn btn-danger"
                     ng-click="container.edit = false;">&times;</button>
diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html
index 73d78e3f5..d534f84c7 100644
--- a/app/components/containers/containers.html
+++ b/app/components/containers/containers.html
@@ -1,10 +1,10 @@
+
 <h2>Containers:</h2>
 
 <div>
     <ul class="nav nav-pills pull-left">
         <li class="dropdown">
-            <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b
-                    class="caret"></b></a>
+            <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b class="caret"></b></a>
             <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
                 <li><a tabindex="-1" href="" ng-click="startAction()">Start</a></li>
                 <li><a tabindex="-1" href="" ng-click="stopAction()">Stop</a></li>
@@ -17,30 +17,30 @@
         </li>
     </ul>
 
-    <div class="pull-right">
-        <input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label
-            for="displayAll">Display All</label>
+    <div class="pull-right form-inline">
+        <input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label for="displayAll">Display All</label>&nbsp;
+        <input type="text" class="form-control" style="vertical-align: center" id="filter" placeholder="Filter" ng-model="filter"/> <label class="sr-only" for="filter">Filter</label>
     </div>
 </div>
 <table class="table table-striped">
     <thead>
-    <tr>
-        <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()"/> Action</th>
-        <th>Name</th>
-        <th>Image</th>
-        <th>Command</th>
-        <th>Created</th>
-        <th>Status</th>
-    </tr>
+        <tr>
+            <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()" /> Action</th>
+            <th>Name</th>
+            <th>Image</th>
+            <th>Command</th>
+            <th>Created</th>
+            <th>Status</th>
+        </tr>
     </thead>
     <tbody>
-    <tr ng-repeat="container in containers|orderBy:predicate">
-        <td><input type="checkbox" ng-model="container.Checked"/></td>
-        <td><a href="#/containers/{{ container.Id }}/">{{ container|containername}}</a></td>
-        <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
-        <td>{{ container.Command|truncate:40 }}</td>
-        <td>{{ container.Created|getdate }}</td>
-        <td><span class="label label-{{ container.Status|statusbadge }}">{{ container.Status }}</span></td>
-    </tr>
+        <tr ng-repeat="container in containers | filter:filter | orderBy:predicate">
+            <td><input type="checkbox" ng-model="container.Checked" /></td>
+            <td><a href="#/containers/{{ container.Id }}/">{{ container|containername}}</a></td>
+            <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
+            <td>{{ container.Command|truncate:40 }}</td>
+            <td>{{ container.Created|getdate }}</td>
+            <td><span class="label label-{{ container.Status|statusbadge }}">{{ container.Status }}</span></td>
+        </tr>
     </tbody>
 </table>
diff --git a/app/components/images/images.html b/app/components/images/images.html
index a6b9086f5..00fc2ec09 100644
--- a/app/components/images/images.html
+++ b/app/components/images/images.html
@@ -3,33 +3,38 @@
 
 <h2>Images:</h2>
 
-<ul class="nav nav-pills">
-    <li class="dropdown">
-        <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b
-                class="caret"></b></a>
-        <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
-            <li><a tabindex="-1" href="" ng-click="removeAction()">Remove</a></li>
-        </ul>
-    </li>
-    <li><a data-toggle="modal" data-target="#pull-modal" href="">Pull</a></li>
-</ul>
+<div>
+    <ul class="nav nav-pills pull-left">
+        <li class="dropdown">
+            <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b class="caret"></b></a>
+            <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
+                <li><a tabindex="-1" href="" ng-click="removeAction()">Remove</a></li>
+            </ul>
+        </li>
+        <li><a data-toggle="modal" data-target="#pull-modal" href="">Pull</a></li>
+    </ul>
+
+    <div class="pull-right form-inline">
+        <input type="text" class="form-control" id="filter" placeholder="Filter" ng-model="filter"/> <label class="sr-only" for="filter">Filter</label>
+    </div>
+</div>
 <table class="table table-striped">
     <thead>
-    <tr>
-        <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()"/> Action</th>
-        <th>Id</th>
-        <th>Repository</th>
-        <th>VirtualSize</th>
-        <th>Created</th>
-    </tr>
+        <tr>
+            <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()" /> Action</th>
+            <th>Id</th>
+            <th>Repository</th>
+            <th>VirtualSize</th>
+            <th>Created</th>
+        </tr>
     </thead>
     <tbody>
-    <tr ng-repeat="image in images | orderBy:predicate">
-        <td><input type="checkbox" ng-model="image.Checked"/></td>
-        <td><a href="#/images/{{ image.Id }}/?tag={{ image|repotag }}">{{ image.Id|truncate:20}}</a></td>
-        <td>{{ image|repotag }}</td>
-        <td>{{ image.VirtualSize|humansize }}</td>
-        <td>{{ image.Created|getdate }}</td>
-    </tr>
+        <tr ng-repeat="image in images | filter:filter | orderBy:predicate">
+            <td><input type="checkbox" ng-model="image.Checked" /></td>
+            <td><a href="#/images/{{ image.Id }}/?tag={{ image|repotag }}">{{ image.Id|truncate:20}}</a></td>
+            <td>{{ image|repotag }}</td>
+            <td>{{ image.VirtualSize|humansize }}</td>
+            <td>{{ image.Created|getdate }}</td>
+        </tr>
     </tbody>
 </table>