diff --git a/app.json b/app.json
new file mode 100644
index 0000000..112055e
--- /dev/null
+++ b/app.json
@@ -0,0 +1,27 @@
+{
+  "name": "joatu-django",
+  "description": "pipeline file for joatu-test",
+  "scripts": {
+  },
+  "env": {
+    "GOOGLE_API_KEY": {
+      "required": true
+    },
+    "SMTP_PASSWORD": {
+      "required": true
+    }
+  },
+  "formation": {
+    "web": {
+      "quantity": 1
+    }
+  },
+  "addons": [
+    "heroku-postgresql"
+  ],
+  "buildpacks": [
+    {
+      "url": "heroku/python"
+    }
+  ]
+}
diff --git a/projects/models.py b/projects/models.py
index 9bcb74c..e2d3a1a 100755
--- a/projects/models.py
+++ b/projects/models.py
@@ -41,7 +41,7 @@ class Project(models.Model):
         ('Hea_oth', 'Other activity'),
         ('Soc_foo', 'Food security'),
         ('Soc_chi', 'Childcare'),
-        ('Soc_eld', 'Eldercare'),
+        ('Soc_eld', 'Senior Friendly'),
         ('Soc_ani', 'Animalcare'),
         ('Soc_oth', 'Other activity'),
         ('Env_gar', 'Gardening'),
diff --git a/projects/templates/create_project.html b/projects/templates/create_project.html
index 81ea979..04dff67 100644
--- a/projects/templates/create_project.html
+++ b/projects/templates/create_project.html
@@ -14,7 +14,7 @@
 {% load static %}
 
 <div id="create_Project">
-
+    
     <div id="dialog" title="Missing answer" style="display:none;">
         <p id="box_message">Please answer all questions</p>
     </div>
@@ -35,7 +35,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                         <div class="col-10 offset-1">
                             <div class="" style="text-align:center;">
                                 <span style="margin-bottom:5px;font-size:1em;" >Congratulations on becoming a <br>Community Organizer!
-                                    <br>This is both a great opportunity and a serious responsibility so it is important to, <br> <strong style="font-size:1.3em;">Please create your community activity with care.</strong>
+                                    <br>This is both a great opportunity and a serious responsibility so it is important to, <br> <strong style="font-size:1.3em;">Please create your community activity with care.</strong> 
                                 </span>
                             </div>
                         </div>
@@ -55,7 +55,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                     <div class="row">
                         <div class="col-12">
                             <span>Which <strong>Category</strong> & <strong>Subcategory</strong> are the best fit for your community activity?</span>
-                        </div>
+                        </div>  
                     </div>
                     <div class="row select_category" >
                         <div class="col-12">
@@ -274,12 +274,12 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                                         </label>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
+                            </div>  
+                        </div>  
                     </div>
                     <hr>
                 </div>
-        <!--#########################################################################################-->
+        <!--#########################################################################################-->        
                 <div id="page_2" style="display:none;">
                     <div class="row question">
                         <div class="col-12">
@@ -295,7 +295,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                     <div class="row">
                         <div class="col-12" style="text-align:left;">
                             <span>Please check one of the following three options:</span>
-                        </div>
+                        </div>  
                     </div>
                     <div class="row" >
                         <div class="col-10 offset-1">
@@ -324,7 +324,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                     <hr>
                 </div>
         <!-- ##################################################QUESTION2############################################################-->
-                <div id="page_3" style="display:none;">
+                <div id="page_3" style="display:none;"> 
                     <div class="row question">
                         <div class="col-12">
                             <div class="" style="text-align:center;">
@@ -332,13 +332,13 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
+                    <hr>      
                     <div class="row">
                         <div class="col-3">
                             <label for="name">Title:</label>
                         </div>
                         <div class="col-8" style="text-align:left;">
-                            <input class="form-control" type="text" name="name" id="name" placeholder="Give a name to your Activity" required style="width:100%;">
+                            <input class="form-control" type="text" name="name" id="name" placeholder="Give a name to your Activity" required style="width:100%;">                        
                         </div>
                     </div>
                     <div class="row">
@@ -397,7 +397,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
+                    <hr>  
                     <div class="row" >
                         <div class="col-7 offset-1" style="margin-right:5px;">
                             <label class="container_radio" for="hub">
@@ -425,7 +425,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                                 <input class="form-control"  type="text" name="" id="address_postal_code" required>
                                 <label style="margin-top:10px;" for="address_city">City</label>
                                 <input class="form-control"  type="text" id="address_city" required>
-                            </div>
+                            </div>         
                         </div>
                     </div>
                     <hr>
@@ -439,12 +439,12 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
+                    <hr>   
                     <div id="attendees_div" style="display:none;">
                         <div class="row">
                             <div class="col-12" style="text-align:center;">
                                 <span><strong>Attendees</strong></span>
-                            </div>
+                            </div>  
                         </div>
                         <div class="row" style="margin-top:15px;">
                             <div class="row">
@@ -466,12 +466,12 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                         <div class="row">
                             <div class="col-12" style="text-align:center;">
                                 <span><strong>Volunteers</strong></span>
-                            </div>
+                            </div>  
                         </div>
                         <div class="row">
                             <div class="col-12" style="text-align:center;">
                                 <span>Do you have identified more than 1 volunteer role?</span>
-                            </div>
+                            </div>  
                         </div>
                         <div class="row" style="margin-top:15px;" >
                             <div class="col-4 offset-1">
@@ -501,7 +501,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                         </div>
                         <hr>
                     </div>
-                </div>
+                </div>        
         <!-- ##################################################ROLES############################################################-->
                 <!-- Role 1-->
                 <div id="page_6" class= "volunteer_role" style="display:none;">
@@ -518,7 +518,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             <label for="name">Title:</label>
                         </div>
                         <div class="col-8" style="text-align:left;">
-                            <input class="form-control" type="text" name="name" id="title_role_1" placeholder="What should this group of volunteers be called?" required >
+                            <input class="form-control" type="text" name="name" id="title_role_1" placeholder="What should this group of volunteers be called?" required >                        
                         </div>
                     </div>
                     <hr>
@@ -530,7 +530,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             <textarea class="form-control" id="description_role_1" cols="100" rows="8" placeholder="A more detailed description will help your volunteers be better prepared." required></textarea>
                         </div>
                     </div>
-                    <hr>
+                    <hr> 
                     <div class="row" style="margin-top:15px;">
                         <div class="row">
                             <div class="col-10 offset-1">
@@ -555,7 +555,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
+                    <hr>     
                 </div>
                 <!-- Role 2-->
                 <div id="page_7" class= "volunteer_role" style="display:none;">
@@ -572,7 +572,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             <label for="name">Title:</label>
                         </div>
                         <div class="col-8" style="text-align:left;">
-                            <input class="form-control" type="text" name="name" id="title_role_2" placeholder="What should this group of volunteers be called?" required >
+                            <input class="form-control" type="text" name="name" id="title_role_2" placeholder="What should this group of volunteers be called?" required >                        
                         </div>
                     </div>
                     <hr>
@@ -584,7 +584,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             <textarea class="form-control" id="description_role_2" cols="100" rows="8" placeholder="A more detailed description will help your volunteers be better prepared." required></textarea>
                         </div>
                     </div>
-                    <hr>
+                    <hr> 
                     <div class="row" style="margin-top:15px;">
                         <div class="row">
                             <div class="col-10 offset-1">
@@ -609,7 +609,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
+                    <hr>     
                 </div>
                 <!-- Role 3-->
                 <div id="page_8" class= "volunteer_role" style="display:none;">
@@ -626,7 +626,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             <label for="name">Title:</label>
                         </div>
                         <div class="col-8" style="text-align:left;">
-                            <input class="form-control" type="text" name="name" id="title_role_3" placeholder="What should this group of volunteers be called?" required >
+                            <input class="form-control" type="text" name="name" id="title_role_3" placeholder="What should this group of volunteers be called?" required >                        
                         </div>
                     </div>
                     <hr>
@@ -663,7 +663,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
+                    <hr>    
                 </div>
                 <!-- Role 4-->
                 <div id="page_9" class= "volunteer_role" style="display:none;">
@@ -680,7 +680,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             <label for="name">Title:</label>
                         </div>
                         <div class="col-8" style="text-align:left;">
-                            <input class="form-control" type="text" name="name" id="title_role_4" placeholder="What should this group of volunteers be called?" required >
+                            <input class="form-control" type="text" name="name" id="title_role_4" placeholder="What should this group of volunteers be called?" required >                        
                         </div>
                     </div>
                     <hr>
@@ -717,7 +717,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
+                    <hr>    
                 </div>
                 <!-- Role 5-->
                 <div id="page_10" class= "volunteer_role" style="display:none;">
@@ -734,7 +734,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             <label for="name">Title:</label>
                         </div>
                         <div class="col-8" style="text-align:left;">
-                            <input class="form-control" type="text" name="name" id="title_role_5" placeholder="What should this group of volunteers be called?" required >
+                            <input class="form-control" type="text" name="name" id="title_role_5" placeholder="What should this group of volunteers be called?" required >                        
                         </div>
                     </div>
                     <hr>
@@ -771,11 +771,11 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                             </div>
                         </div>
                     </div>
-                    <hr>
-                </div>
+                    <hr>    
+                </div> 
 <!-- Preview page -->
                 <div id="preview_page" style="display:none;">
-                </div>
+                </div>   
             </div>
         </div>
     </div>
@@ -788,14 +788,14 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
         <div class="col-5" id="button_right" style="text-align:right;">
 
         </div>
-    </div>
+    </div>                           
     </div>
     <div style="padding-bottom:100px;">
 
     </div>
 </div>
 
-
+        
         <form id="form_create_project" style="display:none">
                 {% csrf_token %}
                 <input pattern=".{1,20}" type="text" name ="name"  id="inputName" required>
@@ -814,38 +814,38 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                 <div id="role_1">
                     <input pattern=".{1,50}" type="text" name ="volunteers[0][role]"id="inputRole1Title" value="role1">
                     <textarea name="volunteers[0][description]" id="inputRole1Description">role1</textarea>
-                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[0][seats]" id="inputRole1Seat"  value="1">
+                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[0][seats]" id="inputRole1Seat"  value="1">        
                     <input type="number" pattern="[0-9]" min="0" name="volunteers[0][minimum_registration]"  value="1" id="inputRole1MinimumRegistration">
                 </div>
-                <div id="role_2">
+                <div id="role_2">   
                     <input pattern=".{1,50}" type="text" name ="volunteers[1][role]"id="inputRole2Title" value="role2">
                     <textarea name="volunteers[1][description]" id="inputRole2Description">role2</textarea>
-                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[1][seats]" id="inputRole2Seat"  value="1">
+                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[1][seats]" id="inputRole2Seat"  value="1">        
                     <input type="number" pattern="[0-9]" min="0" name="volunteers[1][minimum_registration]"  value="1" id="inputRole2MinimumRegistration" >
                 </div>
                 <div id="role_3">
                     <input pattern=".{1,50}" type="text" name ="volunteers[2][role]"id="inputRole3Title" value="role3">
                     <textarea name="volunteers[2][description]" id="inputRole3Description">role3</textarea>
-                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[2][seats]" id="inputRole3Seat"  value="1">
+                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[2][seats]" id="inputRole3Seat"  value="1">        
                     <input type="number" pattern="[0-9]" min="0" name="volunteers[2][minimum_registration]"  value="1" id="inputRole3MinimumRegistration" >
                 </div>
                 <div id="role_4">
                     <input pattern=".{1,50}" type="text" name ="volunteers[3][role]"id="inputRole4Title" value="role4">
                     <textarea name="volunteers[3][description]" id="inputRole4Description">role4</textarea>
-                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[3][seats]" id="inputRole4Seat"  value="1">
+                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[3][seats]" id="inputRole4Seat"  value="1">        
                     <input type="number" pattern="[0-9]" min="0" name="volunteers[3][minimum_registration]"  value="1" id="inputRole4MinimumRegistration" >
                 </div>
                 <div id="role_5">
                     <input pattern=".{1,50}" type="text" name ="volunteers[4][role]"id="inputRole5Title" value="role5">
                     <textarea name="volunteers[4][description]" id="inputRole5Description">role5</textarea>
-                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[4][seats]" id="inputRole5Seat"  value="1">
+                    <input type="number" pattern="[0-9]" min="1"  name="volunteers[4][seats]" id="inputRole5Seat"  value="1">        
                     <input type="number" pattern="[0-9]" min="0" name="volunteers[4][minimum_registration]"  value="1" id="inputRole5MinimumRegistration" >
                 </div>
                 <div id="form_attendees">
                     <input type="number" pattern="[0-9]" min="2"  name="attendees[seats]" id="inputAttendeeSeat" value="2">
-                    <input type="number" pattern="[0-9]" min="2"  name="attendees[minimum_registration]" id="inputAttendeeMinRegistration" value="2">
+                    <input type="number" pattern="[0-9]" min="2"  name="attendees[minimum_registration]" id="inputAttendeeMinRegistration" value="2">        
                 </div>
-
+                
         </form>
 
 
@@ -879,7 +879,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
                 });
                 if (parseInt(number_volunteers_role.val()) < parseInt(number_min_role.val())) {
                    number_volunteers_role.val(number_min_role.val());
-                }
+                }                 
             }
         })
         //////////////////-Attendiees-Registration-Input-Logic-////////////////////
@@ -889,7 +889,7 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
             });
             if (parseInt($('#number_attendees').val()) < parseInt(this.value)) {
                 $('#number_attendees').val(this.value);
-            }
+            }            
         })
         //////////////////////////////////////////////////////////////////
         $('input[id$="_oth"],input[id="Oth"]').click(function() {
@@ -899,32 +899,6 @@ <h5 style="margin-bottom:5px;">Organize a Community activity</h5>
             $('.other-category-input').css('display', 'none');
         });
     });
-    $("#date_start").on('change', function(){
-      // set end date to same day
-      $("#date_end").val($("#date_start").val())
-    })
-    $("#time_start").on('change', function(){
-      // automatically add 2 hours to time_end when time_start changes
-      var time = $("#time_start").val()
-      var hours = time.substr(0, time.indexOf(':'))
-      var minutes = time.substr(time.indexOf(':')+1, time.indexOf('M')-4)
-      if (hours > 9 && hours != 12 && time.indexOf('PM') !== -1){
-        $("#time_end").val('11:30 PM')
-      } else {
-        hours = parseInt(hours) + 2
-        if (hours >= 12){
-          if(hours % 12 != 0){
-          var time = hours % 12+':'+minutes+' PM'
-        } else {
-          var time = 12+':'+minutes+' PM'
-        }
-        } else {
-          time = hours+':'+minutes+' '+time.substr(time.indexOf('M')-1)
-        }
-        $("#time_end").val(time)
-      }
-
-    })
 </script>
 
-{% endblock script %}
+{% endblock script %}
\ No newline at end of file
diff --git a/rest_api/accounts/serializers.py b/rest_api/accounts/serializers.py
index aff58fc..9818231 100644
--- a/rest_api/accounts/serializers.py
+++ b/rest_api/accounts/serializers.py
@@ -11,7 +11,7 @@
 class MyPasswordResetSerializer(PasswordResetSerializer):
     def get_email_options(self):
         return {
-            'domain_override': 'joatu-test.herokuapp.com',
+            'domain_override': 'joatu2018.herokuapp.com',
         }
 class MyRegisterSerializer(serializers.Serializer):
     email = serializers.EmailField(required=allauth_settings.EMAIL_REQUIRED)