diff --git a/hledger-api/client/accounts/view.html b/hledger-api/client/accounts/view.html
index c37653aee..a8fdcba56 100644
--- a/hledger-api/client/accounts/view.html
+++ b/hledger-api/client/accounts/view.html
@@ -1,7 +1,9 @@
 <div ng-controller="AccountsController as accountsList">
   <h2>Accounts</h2>
+  Search: <input ng-model="query"/>
   <ul class="unstyled">
-    <li ng-repeat="account in accountsList.acocunts">
+    {{accountsList.accounts}}
+    <li ng-repeat="account in accounts | filter: query">
       <a href="#/accounts/{{account.name}}/journal">{{account.name}}</a>
       <span class="balance">{{account.balance}}</span>
     </li>
diff --git a/hledger-api/client/hledger-client.js b/hledger-api/client/hledger-client.js
index 72b39601f..a3fb8965a 100644
--- a/hledger-api/client/hledger-client.js
+++ b/hledger-api/client/hledger-client.js
@@ -8,9 +8,7 @@ hledger.config(function($stateProvider, $urlRouterProvider) {
     .state('accounts', {
       url: "/accounts",
       templateUrl: "accounts/view.html",
-      controller: function($scope) {
-        $scope.accounts = ["A", "List", "Of", "Items"];
-      }
+      controller: 'AccountsController'
     })
     .state('help', {
       url: "/help",
@@ -24,7 +22,7 @@ hledger.factory('Journal', function($resource) {
 
 hledger.controller("JournalController", function($scope, Journal) {
   Journal.query(function(data) {
-   $scope.journals = data;
+   $scope.journal = data;
   });
 });
 
diff --git a/hledger-api/client/journals/view.html b/hledger-api/client/journal/index.html
similarity index 68%
rename from hledger-api/client/journals/view.html
rename to hledger-api/client/journal/index.html
index 3d6d21d1b..7d4d2a4a7 100644
--- a/hledger-api/client/journals/view.html
+++ b/hledger-api/client/journal/index.html
@@ -1,3 +1,4 @@
 <div ng-controller="JournalController as journal">
-  {{journal.account.name}}
+  {{journal.name}}
 </div>
+