diff --git a/www/index.html b/www/index.html
index 5bf02ff..587e8f5 100644
--- a/www/index.html
+++ b/www/index.html
@@ -28,17 +28,17 @@
   </head>
 <body ng-app="starter">
 
-  <ion-pane ng-controller="OverviewController as vm">
+  <ion-pane ng-controller="OverviewController as overview">
     <ion-header-bar class="bar-stable">
       <h1 class="title">🎂  Birthdays  🎉</h1>
       <div class="buttons">
-        <button ng-click="vm.showAddBirthdayModal()" class="button button-icon icon ion-android-add"></button>
+        <button ng-click="overview.showAddBirthdayModal()" class="button button-icon icon ion-android-add"></button>
       </div>
 
     </ion-header-bar>
     <ion-content>        
       <ion-list>
-        <ion-item ng-repeat="b in vm.birthdays" ng-click="vm.showEditBirthdayModal(b)">
+        <ion-item ng-repeat="b in overview.birthdays" ng-click="overview.showEditBirthdayModal(b)">
           <div style="float: left">{{ b.Name }}</div>
           <div style="float: right">{{ b.Date | date:"dd MMMM yyyy" }}</div>
         </ion-item>
@@ -49,22 +49,22 @@ <h1 class="title">🎂  Birthdays  🎉</h1>
   <script id="add-or-edit-birthday.html" type="text/ng-template">
     <ion-modal-view>
       <ion-header-bar>
-        <h1 class="title">{{ action }} Birthday</h1> 
+        <h1 class="title">{{ overview.action }} Birthday</h1> 
         <div class="buttons">
-        <button ng-hide="isAdd" ng-click="deleteBirthday()" class="button button-icon icon ion-trash-a"></button>
+        <button ng-hide="isAdd" ng-click="overview.deleteBirthday()" class="button button-icon icon ion-trash-a"></button>
         </div>
       </ion-header-bar>
       <ion-content>
         <div class="list list-inset">
           <label class="item item-input">
-          <input type="text" placeholder="Name" ng-model="birthday.Name">
+          <input type="text" placeholder="Name" ng-model="overview.birthday.Name">
           </label>
           <label class="item item-input">
-          <input type="date" placeholder="Birthday" ng-model="birthday.Date">
+          <input type="date" placeholder="Birthday" ng-model="overview.birthday.Date">
           </label>
         </div>
         <div class="padding">
-          <button ng-click="saveBirthday()" class="button button-block button-positive activated">Save</button>
+          <button ng-click="overview.saveBirthday()" class="button button-block button-positive activated">Save</button>
         </div>
       </ion-content>
     </ion-modal-view>
diff --git a/www/js/overview.controller.js b/www/js/overview.controller.js
index aa2f540..9d6f82a 100644
--- a/www/js/overview.controller.js
+++ b/www/js/overview.controller.js
@@ -1,59 +1,71 @@
 (function(){
-angular.module('starter').controller('OverviewController', ['$scope', '$ionicModal', '$ionicPlatform', 'BirthdayService', OverviewController]);
-
-function OverviewController($scope, $ionicModal, $ionicPlatform, birthdayService) {
-	var vm = this;
-
-	// Initialize the database.
-	$ionicPlatform.ready(function() {
-		birthdayService.initDB();
-
-		// Get all birthday records from the database.
-		birthdayService.getAllBirthdays().then(function(birthdays) {
-			vm.birthdays = birthdays;
-		});
-	});
-	
-	// Initialize the modal view.
-	$ionicModal.fromTemplateUrl('add-or-edit-birthday.html', {
-		scope: $scope,
-		animation: 'slide-in-up'
-	}).then(function(modal) {
-		$scope.modal = modal;
-	});
-	
-	vm.showAddBirthdayModal = function() {
-		$scope.birthday = {};
-		$scope.action = 'Add';
-		$scope.isAdd = true;
-		$scope.modal.show();			
-	};
-	
-	vm.showEditBirthdayModal = function(birthday) {
-		$scope.birthday = birthday;
-		$scope.action = 'Edit';
-		$scope.isAdd = false;			
-		$scope.modal.show();
-	};
-
-	$scope.saveBirthday = function() {
-		if ($scope.isAdd) {
-			birthdayService.addBirthday($scope.birthday);				
-		} else {
-			birthdayService.updateBirthday($scope.birthday);				
-		}						
-		$scope.modal.hide();
-	};
-	
-	$scope.deleteBirthday = function() {
-		birthdayService.deleteBirthday($scope.birthday);			
-		$scope.modal.hide();
-	};
-			
-	$scope.$on('$destroy', function() {
-		$scope.modal.remove(); 
-	});
-
-	return vm;
-}
-})();
\ No newline at end of file
+    angular.module('starter').controller('OverviewController', ['$scope', '$ionicModal', '$ionicPlatform', 'BirthdayService', OverviewController]);
+
+    function OverviewController($scope, $ionicModal, $ionicPlatform, birthdayService) {
+
+        var vm = this;	
+
+        vm.birthday = {};
+        vm.action = '';
+        vm.isAdd = false;
+        vm.modal = {};
+
+        vm.showAddBirthdayModal = showAddBirthdayModal;
+        vm.showEditBirthdayModal  = showEditBirthdayModal; 
+        vm.saveBirthday = saveBirthday;
+        vm.deleteBirthday = deleteBirthday;
+
+        // Initialize the database.
+        $ionicPlatform.ready(function() {
+            birthdayService.initDB();
+
+            // Get all birthday records from the database.
+            birthdayService.getAllBirthdays().then(function(birthdays) {
+                vm.birthdays = birthdays;
+            });
+        });
+
+        // Initialize the modal view.
+        $ionicModal.fromTemplateUrl('add-or-edit-birthday.html', {
+            scope: $scope,
+            animation: 'slide-in-up'
+        }).then(function(modal) {
+            vm.modal = modal;
+        });
+
+        function showAddBirthdayModal() {
+            vm.birthday = {};
+            vm.action = 'Add';
+            vm.isAdd = true;
+            vm.modal.show();			
+        }
+
+        function showEditBirthdayModal(birthday) {
+            vm.birthday = birthday;
+            vm.action = 'Edit';
+            vm.isAdd = false;			
+            vm.modal.show();
+        }
+
+        function saveBirthday() {
+            if (vm.isAdd) {
+                birthdayService.addBirthday(vm.birthday);				
+            } else {
+                birthdayService.updateBirthday(vm.birthday);				
+            }						
+            vm.modal.hide();
+        }
+
+        function deleteBirthday() {
+            birthdayService.deleteBirthday(vm.birthday);			
+            vm.modal.hide();
+        }
+
+        $scope.$on('$destroy', function() {
+            vm.modal.remove(); 
+        });
+
+    }
+})();
+
+
