diff --git a/members/templates/index.html b/members/templates/index.html
index b905198..f27671c 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -2,10 +2,9 @@
 <html lang="en" ng-app="memberlistApp">
 <head>
 	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<meta name="description" content="">
-	<meta name="author" content="">
+	<meta name="description" content="uli uli">
+	<meta name="author" content="veedeeämkoo">
 
 	<title>Jäsenrekisteri</title>
 	
@@ -31,32 +30,143 @@
 
 	<!--AngularJS-->
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js"></script>
+	<script src = "http://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.min.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-
 	<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
-	<!--<script type='text/javascript' src='js/modernizr.js'></script>-->
-	<script type='text/javascript' src='../static/js/dynamicpage.js'></script>
-	
-	<script src="../static/html/jasenlista.html"></script>
-	<script src="../static/html/lisaa_jasen.html"></script>
 	{%load staticfiles %}
 
 </head>
 
 <body>
-    <ul class="inline">
-        <li><a href="#/list">Listaa jäsenet</a></li>
-        <li><a href="#/add">Lisää jäsen</a></li>
-    </ul>
+	<div id="wrapper">
 
-    <div ng-view></div>
+		<!-- Sidebar -->
+		<div id="sidebar-wrapper">
+			<ul class="sidebar-nav">
+				<li><a href="#/list">Listaa jäsenet</a></li>
+				<li><a href="#/add">Lisää jäsen</a></li>
+			</ul>
+		</div>
+		<!-- /#sidebar-wrapper -->
 
-    <script src="data/appData.js"></script>
-    
-    <script src="lib/angular/angular.js"></script>
+		<!-- Page Content -->
+		<div class="col-lg-12">
+			<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>
+			<div ng-view></div>
+				<script src="../js/remove_member.js"></script>
+				<script src="../js/post_member.js"></script>
 
-    <script src=""></script>
-    <script src=""></script>
-    <script src=""></script>
+				<script type="text/ng-template" id="addStudent.htm">
+
+					<div ng-app="getMemberApp" ng-controller="getController">
+						
+						<table id="choose-address-table" class="ui-widget ui-widget-content">
+						<thead>
+							<tr ng-repeat="ui-widget-header">
+								<th>ID</th>
+								<th>Etunimi</th>
+								<th>Sukunimi</th>
+								<th>Sähköposti</th>
+								<th>AYY-jäsen</th>
+								<th>JAS-listalla</th>
+								<th>Asuinpaikka</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr ng-repeat="x in members">
+								<td>{{ x.id }}</td>
+								<td>{{ x.first_name }}</td>
+								<td>{{ x.last_name }}</td>
+								<td>{{ x.email }}</td>
+								<td>{{ x.AYY }}</td>
+								<td>{{ x.jas }}</td>
+								<td>{{ x.POR }}</td>
+								<td>
+								<input type="button" value="Remove" class="btn btn-primary" ng-click="removeMember(x.id)"></input>
+								</td>
+							</tr>
+						</tbody>
+						</table>
+						
+					</div>
+				</script>
+				<script type="text/ng-template" id="viewStudents.htm">
+					<div ng-app="postApp" ng-controller="postController">
+
+					<div id="input_form">
+					<form name="memberForm" ng-submit="submitForm()">
+						<div class="form-group">
+						<label>Etunimi: </label> 
+						<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="firstName"></input>
+						</div>
+						<div class="form-group">
+						<label>Sukunimi: </label> 
+						<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="lastName"></input>
+						</div>
+						<div class="form-group">
+						<label>Sähköposti: </label>
+						<input id="emailField" required type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="email"></input>
+						</div>
+						<div class="form-group">
+						<label>AYY jäsen: </label> 
+						<input type="checkbox" id="AYY" value="0" ng-model="AYY"></input>
+						</div>
+						<div class="form-group">
+						<label>JAS-listaan: </label> 
+						<input type="checkbox" id="JAS" value="0" ng-model="JAS"></input>
+						</div>
+						<div class="form-group">
+						<label>Asuinkunta: </label> 
+						<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="POR"></input>
+						</div>
+						<button ng-click="send()" type="submit" id="sendmember">Tallenna</button>
+					</form>
+
+					</div>
+					</div>
+
+				</script>
+		</div>
+		<!-- /#page-content -->
+
+      <script>
+         var memberlistApp = angular.module("memberlistApp", ['ngRoute']);
+         memberlistApp.config(['$routeProvider', function($routeProvider) {
+            $routeProvider.
+            
+            when('/list', {
+               templateUrl: 'addStudent.htm',
+               controller: 'AddStudentController'
+            }).
+            
+            when('/add', {
+               templateUrl: 'viewStudents.htm',
+               controller: 'ViewStudentsController'
+            }).
+            
+            otherwise({
+               redirectTo: '/list'
+            });
+         }]);
+         
+         memberlistApp.controller('AddStudentController', function($scope) {
+            $scope.content = "This page will be used to display add student form";
+         });
+         
+         memberlistApp.controller('ViewStudentsController', function($scope) {
+            $scope.content = "This page will be used to display all the students";
+         });
+			
+      </script>
+
+
+		<!--<script src="../static/appData.js"></script>
+	    
+		<script src="lib/angular/angular.js"></script>
+
+		<script src="../static/js/app.js"></script>
+		<script src="../static/js/services.js"></script>
+		<script src="../static/js/controllers.js"></script>-->
+	</div>
 </body>
 </html>
