diff --git a/digitalglarus/static/digitalglarus/css/price.css b/digitalglarus/static/digitalglarus/css/price.css
index 359b47fe..12a0e2f0 100644
--- a/digitalglarus/static/digitalglarus/css/price.css
+++ b/digitalglarus/static/digitalglarus/css/price.css
@@ -196,14 +196,29 @@
     color: #88c7d7;
 }
 
+.glyphicon-calendar{
+    font-size: 42px;
+    display: block;
+    text-align: center;
+    margin: 40px auto 20px;
+    color: #88c7d7;
+}
+
 .glyphicon-ok {
-	font-size: 28px;
+	font-size: 42px;
     display: block;
     text-align: center;
     margin-bottom: 20px;
     color: #88c7d7;
 	margin-top: 0px;
 }
+
+.glyphicon-flag {
+	font-size: 44px;
+    display: block;
+    text-align: center;
+    margin: 30px auto 30px;
+	color: #88c7d7;
 }
 
 
@@ -364,7 +379,7 @@
 }
 
 .form-control {
-    color: #000;
+    color: #999;
 	border-radius: 0px;
 	box-shadow: none;
 }
@@ -619,4 +634,11 @@ th {
     color: inherit;
     background-color: #fff;
 	text-align: left;
+	font-size: 15px;
+}
+
+.term-head {
+	font-size: 18px;
+	font-weight: 700;
+	margin: 0 0 0px;
 }
\ No newline at end of file
diff --git a/digitalglarus/templates/digitalglarus/login.html b/digitalglarus/templates/digitalglarus/login.html
index f61a3f9b..e8d81b47 100644
--- a/digitalglarus/templates/digitalglarus/login.html
+++ b/digitalglarus/templates/digitalglarus/login.html
@@ -2,7 +2,56 @@
 {% load staticfiles bootstrap3 i18n %}
 {% block content %}
 
+<style type="text/css">
+@media screen and (min-width: 768px) {
+	
+	cancel-subscription-modal .modal-dialog  {width:1000px;}
 
+	.glyphicon-flag {
+	font-size: 44px;
+    display: block;
+    text-align: center;
+    margin: 30px auto 30px;
+	color: #88c7d7;
+	
+	.price2 {
+	
+
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+
+}
+
+	cancel-subscription-modal .modal-body {
+		max-height: 800px;
+	}
+}
+
+@media screen and (min-width: 780px) {
+	
+	cancel-subscription-modal .modal-dialog  {width:1000px;}
+
+	.glyphicon-flag {
+	font-size: 44px;
+    display: block;
+    text-align: center;
+    margin: 30px auto 30px;
+	color: #88c7d7;
+	
+	.price2 {
+	
+
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+
+}
+
+	cancel-subscription-modal .modal-body {
+		max-height: 800px;
+	}
+}
+
+</style>
   <section id="price">
     <div class="signup-container">
 	    <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
@@ -43,7 +92,10 @@
               {% endfor %}
               <p>{{form.non_field_errors|striptags}}</p>
          
-              <p class="signup-notice">By logging in you agree to our<a href=#terms>Terms of Service</a>.</p>
+              <p class="signup-notice">By logging in you agree to our<a data-toggle="modal" data-target="#cancel-subscription-modal" target="_blank">Terms of Service</a>.</p>
+			  
+			
+			  
               <button type="submit" class="btn btn-primary btn-blue">Login</button>
             </form>
             <br>
@@ -77,4 +129,66 @@
       </div>
     </div>
   </section>
+  
+ <div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog" aria-hidden ="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                </div>
+                <div class="modal-body">
+                     
+					   <section id="price2">
+    <div class="container">
+     <!--<div class="row col-md-2 text-center wow fadeInDown"></div> -->
+    <div class="row col-xs-12 col-sm-12	col-lg-6 text-center wow fadeInDown">
+       <div class="price-box">
+       <span class="glyphicon glyphicon-flag"></span>
+        <h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
+         <h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2>
+         <hr class="primary">
+            <div class="price-exp-box">
+                <p class="text-left">
+                <p class="term-head">1. Membership</p>
+                1.1. The membership fee is 35CHF per month and charged on the 1st day of each month after your first month of subscription. <br>
+                1.2. Each additional day costs 15CHF for members.<br>
+               <br>
+                <p class="term-head">2. Coworking days</p> 
+                2.1. Coworking days are counted as 1 calendar day. <br> 
+                2.2. Free coworking days are included in the membership. <br>
+                2.3. Unused working days are not refunded and can not be compensated for. <br><br>
+                 <p class="term-head">3. Possible reduction</p>
+                  3.1. Your first month's membership fee is calculated according to the date of your subscription. <br>
+                  3.2. The days already passed in the first month are discounted from the first month's membership fee.<br>
+                  3.3. A member booking more than 19 days for coworking gets a reduction in total cost and will only pay maximum 290CHF per month. The reduction will be applied automatically on Digital Glarus website.<br><br>
+                  <p class="term-head">4. Member's right to cancellation </p>
+                  4.1. The member may cancel or change the booking of working day at any time prior to 7 days before the working day with no extra cost. <br>
+                  4.2. Bookings cancelled less than 7 days before the working date will not be refunded.<br><br>
+                  <p class="term-head">5. Digital Glarus' right to cancel a membership </p>
+                  5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
+                  5.2. Members disrupting the environment of coworking may be rejected to join the membership.<br><br>
+                  <p class="term-head">6. Digital Glarus' right to cancel a membership </p>
+                  6.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
+                  6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.<br> 
+                  6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space.  <br> 
+                  6.4. Digital Glarus may expell a member who disrupts the environment of coworking space from the coworking space, stating the reasons for the expulsion. 
+                <br><br>
+              
+                </p>
+                <div class="text-center">
+					<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
+              </div>
+              <div class="row col-md-2 text-center wow fadeInDown"> 
+              </div>
+                    </div>
+              
+       </div>        
+      </div>
+      <div class="row col-md-3 text-center wow fadeInDown"></div>
+    </div> 
+  </section> 
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
 {% endblock %}
\ No newline at end of file
diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html
index 44ce4762..d73f4fab 100644
--- a/digitalglarus/templates/digitalglarus/membership_payment.html
+++ b/digitalglarus/templates/digitalglarus/membership_payment.html
@@ -21,7 +21,24 @@
   
   @media screen and (min-width: 768px) {
 	
-	#cancel-subscription-modal .modal-dialog  {width:900px;}
+	#cancel-subscription-modal .modal-dialog  {width:1000px;}
+	
+.glyphicon-flag {
+	font-size: 44px;
+    display: block;
+    text-align: center;
+    margin: 30px auto 30px;
+	color: #88c7d7;
+
+	.price2 {
+	
+
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+
+}
+}
+
 
 </style>
 
@@ -198,14 +215,13 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="text-center">General Terms & Conditions of Digital Glarus Membership</h4>
                 </div>
                 <div class="modal-body">
                      
-					   <section id="price">
+					   <section id="price2">
     <div class="container">
-     <div class="row col-md-2 text-center wow fadeInDown"></div> 
-    <div class="row col-md-8 text-center wow fadeInDown">
+     <!--<div class="row col-md-2 text-center wow fadeInDown"></div> -->
+    <div class="row col-xs-12 col-sm-12	col-lg-10 text-center wow fadeInDown">
        <div class="price-box">
        <span class="glyphicon glyphicon-flag"></span>
         <h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
@@ -240,7 +256,6 @@
               
                 </p>
                 <div class="text-center">
-					<button type="submit" class="btn btn-primary btn-blue">Still have a question?</button>
 					<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
               </div>
               <div class="row col-md-2 text-center wow fadeInDown"> 
@@ -253,10 +268,6 @@
     </div> 
   </section> 
                 </div>
-                <div class="modal-footer text-center">
-                    <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
-                    <button type="submit" class="btn btn-primary">Yes</button>
-                </div>
             </div><!-- /.modal-content -->
         </div><!-- /.modal-dialog -->
     </div><!-- /.modal -->
diff --git a/digitalglarus/templates/digitalglarus/membership_pricing.html b/digitalglarus/templates/digitalglarus/membership_pricing.html
index 6d8033f1..63414e2a 100644
--- a/digitalglarus/templates/digitalglarus/membership_pricing.html
+++ b/digitalglarus/templates/digitalglarus/membership_pricing.html
@@ -7,7 +7,25 @@
 <style  type="text/css">
 @media screen and (min-width: 768px) {
 	
-	#cancel-subscription-modal .modal-dialog  {width:900px;}
+	cancel-subscription-modal .modal-dialog  {width:550px;}
+
+	
+
+.glyphicon-calendar{
+    font-size: 42px;
+    display: block;
+    text-align: center;
+    margin: 40px auto 20px;
+    color: #88c7d7;
+}
+.price2 {
+	
+
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+
+}
+
 </style>
 
   <section id="price">
@@ -87,49 +105,49 @@
   </section>
   
   
-    <div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog" aria-hidden ="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="text-center">Payment information</h4>
-                </div>
-                <div class="modal-body">
-                  
-					 
-					   <section id="price">
-    <div class="signup-container">
-	  <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
-      <div class="col-xs-12 col-sm-6 col-lg-4 text-center wow fadeInDown"> 
-        <div class="signup-box">
-          <span class="glyphicon glyphicon-calendar"></span>
-             <h2 class="section-heading">How the pricing works</h2>
-             <hr class="primary">
-               <h2 class="signup-lead text-left"><ul><li>All members get 2 free days per month for booking.<br></li> </ul><ul><li>Additional booking costs 15CHF per day. <br></li></ul><ul><li>But your coworking after 17th day is free of charge. </li></ul><ul><li>So more you work, more you can save money! <br></li></ul><ul><li>You will never be charged more than 290CHF per month.  <br>  </li></ul>            </h2></ul>
-               
-               
-                     
-                          <p class="signup-notice">Still have questions?<a href=#terms>Contact us!</a>.</p>
-                          <div class="notice-box">
-                          </div>
-        </div>
-      </div>       
-     <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
-      </div>
-    </div> 
-    </div>
-      </div>
-    </div>   
-  </section>
-					 
-					 
-					 
-					 
-                </div>
-                <div class="modal-footer text-center">
-                    <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
-                    <button type="submit" class="btn btn-primary">Yes</button>
-                </div>
+<div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog" aria-hidden ="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            </div>
+            <div class="modal-body">
+                 <section id="price2">
+					<div class="signup-container">
+						<div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
+						<div class="col-xs-12 col-sm-12 col-lg-12 text-center wow fadeInDown"> 
+							<div class="signup-box">
+								<span class="glyphicon glyphicon-calendar"></span>
+								<h2 class="section-heading">How the pricing works</h2>
+								<hr class="primary">
+								<h2 class="signup-lead text-left">
+								<ul>
+									<li>All members get 2 free days per month for booking.<br></li> 
+								</ul>
+								<ul>
+									<li>Additional booking costs 15CHF per day. <br></li>
+								</ul>
+								<ul>
+									<li>But your coworking after 17th day is free of charge. </li>
+								</ul>
+								<ul>
+									<li>So more you work, more you can save money! <br></li>
+								</ul>
+								<ul>
+									<li>You will never be charged more than 290CHF per month.  <br>  </li>
+								</ul>            
+								</h2>
+								<br>
+									<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
+								<div class="notice-box">
+								</div>
+							</div>
+						</div>       
+						<div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
+					</div>
+				</section>	 
+            </div>
+              
             </div><!-- /.modal-content -->
         </div><!-- /.modal-dialog -->
     </div><!-- /.modal -->
diff --git a/digitalglarus/templates/digitalglarus/terms.html b/digitalglarus/templates/digitalglarus/terms.html
index d0b02999..e5bbaa81 100755
--- a/digitalglarus/templates/digitalglarus/terms.html
+++ b/digitalglarus/templates/digitalglarus/terms.html
@@ -6,11 +6,7 @@
 <html lang="en">
   <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="">
+
 
     <title>Digital Glarus</title>
 
@@ -19,7 +15,7 @@
     <link href="./css/lib/animate.min.css" rel="stylesheet">
 
     <!-- Custom CSS -->
-    <link href="css/agency.css" rel="stylesheet">
+   
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -42,59 +38,13 @@
       ga('send', 'pageview');
 
     </script>
-    <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
-    <style id="igtranslator-color" type="text/css"></style></head>
+    
+    </head>
 
   <body id="page-top" class="index">
 
     <!-- Navigation -->
-    <nav class="navbar navbar-default navbar-fixed-top navbar-shrink">
-      <div class="container" style="margin-right: -; margin-left: 0px;margin-right: 0px;">
-	<!-- Brand and toggle get grouped for better mobile display -->
-	<div class="navbar-header page-scroll">
-	  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-	    <span class="sr-only">Toggle navigation</span>
-	    <span class="icon-bar"></span>
-	    <span class="icon-bar"></span>
-	    <span class="icon-bar"></span>
-	  </button>
-	  <p><a class="navbar-brand page-scroll" href="#page-top"><img src="/static/digitalglarus/img/logo_white.svg"></a></p>
-	</div>
 
-	<!-- Collect the nav links, forms, and other content for toggling -->
-	<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-	  <ul class="nav navbar-nav navbar-right">
-	    <li class="hidden active">
-	      <a href="#page-top"></a>
-	    </li>
-	   <!-- <li>
-	      <a class="page-scroll" href="#services">membership</a></li>
-	    <li></li>
-	    <li></li>
-	    <li> </li> -->
-	    <li>
-	      <a class="page-scroll" href="{% url 'digitalglarus:booking' %}">booking & price</a></li>
-	    <li>
-	      <a class="page-scroll" href="{% url 'digitalglarus:history' %}">history</a>
-	    </li>
-	    <li>
-	      <a class="page-scroll" href="http://blog.ungleich.ch">BLOG</a>
-	    </li>
-	    <li>
-	      <a class="page-scroll" href="#contact">Contact</a>
-	    </li>
-        <li>
-	      <a class="page-scroll" href="{% url 'digitalglarus:login' %}">Log In</a>
-	    </li>
-         <li>
-	      <a class="page-scroll" href="#contact">Sign Up</a>
-	    </li>
-	  </ul>
-	</div>
-	<!-- /.navbar-collapse -->
-      </div>
-      <!-- /.container-fluid -->
-    </nav>
 
   
     <!-- Services Section -->
@@ -147,83 +97,6 @@
       <div class="row col-md-3 text-center wow fadeInDown"></div>
     </div> 
   </section> 
-      <!--membership includes-->
-     
-	    <!--<div class="col-md-6 col-sm-6 text-center wow fadeInDown">
-         <div class="price-box">
-	       <h2 class="section-heading">Monthly Membership</h2>
-              <hr class="primary">
-                <p class="carousel-text text-center supporter-black">
-                  -35 CHF / month
-                  <br>
-                Access to events, which lets you connect with. Includes 2 
-                day passes. Access to any available desk in the common 
-                area. Just bring your laptop, pick an open seat, and get 
-                to work. 
-                </p> 
-                  <button type="submit" class="btn btn-primary">sign up</button>
-         </div>
-        </div>
-        
-        <div class="col-md-6 col-sm-6 text-center wow fadeInDown">
-          <div class="price-box">
-             <h2 class="section-heading">Day Pass</h2>
-                <hr class="primary">
-                   <p class="carousel-text text-center supporter-black">
-                     - 15 CHF / day<br>
-                      Access to events, which lets you connect with. 
-                      Includes 2 day passes. Access to any available desk 
-                      in the common area. Just bring your laptop, pick an 
-                      open seat, and get to work. </p>
-                       <button type="submit" class="btn btn-primary">sign up</button>
-          </div>
-        </div>--> 
-    <!-- contact-->
-    <section id="contact">
-      <div class="fill">
-       <div class="row col-lg-12" class="wow fadeInDown">
-	     <div class="col-md-4 map-title">
-          Digital Glarus <br>
-            <span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
-             <br>info@digitalglarus.ch
-              <br>
-              (044) 534-66-22
-	           <p>&nbsp;</p>
-            </span>
-	     </div>
-	      <p>&nbsp;</p>
-	   </div>
-      </div> 
-    </section>
-
- <!--    <footer>
-      <div class="container">
-	    <div class="row">
-	      <div class="col-md-4">
-	        <span class="copyright">Copyright © ungleich GmbH 2016</span>
-	      </div>
-	      <div class="col-md-4">
-	         <ul class="list-inline social-buttons">
-	           <li><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
-	            </li>
-	           <li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>
-	            </li>
-	           <li><a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a>
-	            </li>
-                   <li><a href="https://www.facebook.com/digitalglarus/"><i class="fa fa-facebook"></i></a>
-	            </li>
-	         </ul>
-	      </div>
-	      <div class="col-md-4">
-	         <ul class="list-inline quicklinks">
-	           <li><a href="http://www.ungleich.ch/">ungleich Home</a>
-	           </li>
-	         </ul>
-	      </div>
-	    </div>
-      </div>
-    </footer> -->
-
    
 <!-- jQuery -->
 <script src="js/jquery.js"></script>
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index a12cce56..9beacc3d 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -182,7 +182,6 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'app'
-		
     }
 }
 
diff --git a/stripe_keys.sh b/stripe_keys.sh
index 6ec79ff6..5681e62c 100644
--- a/stripe_keys.sh
+++ b/stripe_keys.sh
@@ -1,2 +1,2 @@
-export STRIPE_API_PRIVATE_KEY='sk_test_dqAmbKAij12QCGfkYZ3poGt2'
-export STRIPE_API_PUBLIC_KEY='pk_test_QqBZ50Am8KOxaAlOxbcm9Psl'
\ No newline at end of file
+export STRIPE_API_PRIVATE_KEY=sk_test_dqAmbKAij12QCGfkYZ3poGt2
+export STRIPE_API_PUBLIC_KEY=pk_test_QqBZ50Am8KOxaAlOxbcm9Psl
\ No newline at end of file