diff --git a/digitalglarus/static/digitalglarus/js/payment.js b/digitalglarus/static/digitalglarus/js/payment.js
index 2b06759a..c7463a5a 100644
--- a/digitalglarus/static/digitalglarus/js/payment.js
+++ b/digitalglarus/static/digitalglarus/js/payment.js
@@ -55,7 +55,6 @@ $( document ).ready(function() {
         $form.find('[type=submit]').html('Validating <i class="fa fa-spinner fa-pulse"></i>');
 			console.log("submiting2");
         var PublishableKey = window.stripeKey;
-		alert(PublishableKey);
         Stripe.setPublishableKey(PublishableKey);
         Stripe.card.createToken($form, function stripeResponseHandler(status, response) {
             if (response.error) {
diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html
index f257d1d9..cfa079a2 100644
--- a/digitalglarus/templates/digitalglarus/booking_payment.html
+++ b/digitalglarus/templates/digitalglarus/booking_payment.html
@@ -164,8 +164,8 @@
                     <br/>
                     <input type="checkbox" class="custom-control-input agree-terms">
                     <span class="custom-control-indicator"></span>
-                    <span class="custom-control-description">I accept the Digital Glarus <a href="{% url 'digitalglarus:TermsAndConditions' %}" target="_blank">Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
-                    </label>
+					<span class="custom-control-description">I accept the Digital Glarus <a data-toggle="modal" data-target="#cancel-subscription-modal" target="_blank">Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
+				   </label>
                     <div class="button-box">
                         <div class="row">
                           <div class="col-xs-12">
@@ -203,6 +203,64 @@
       </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-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-7 col-lg-6 text-center wow fadeInDown">
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+								<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 -->
+  
 
 <!-- stripe key data -->
 {% if stripe_key %}
diff --git a/digitalglarus/templates/digitalglarus/new_credit_card.html b/digitalglarus/templates/digitalglarus/new_credit_card.html
index a8686755..3163738c 100644
--- a/digitalglarus/templates/digitalglarus/new_credit_card.html
+++ b/digitalglarus/templates/digitalglarus/new_credit_card.html
@@ -22,6 +22,8 @@
   .order-bottom-text a{
     margin-left: 0px;
   }
+  
+
 </style>
 
   <section id="price">
@@ -33,13 +35,7 @@
                  <hr class="greyline-long">
                   
                   <h2 class="membership-lead">
-                      Your Digital Glarus Membership enables 
-                      you to use our coworking space and it includes 
-                      2 working days for the month you signed up. 
-                      The membership fee is a monthly subscription. 
-                       Additional day costs 
-                      15CHF per day. More than 17 days a month it 
-                      will charge only 290CHF/month.
+           
                   </h2>
                   {% if is_free %}
                       <h2 class="billing-head">Billing Adress</h2>
@@ -72,7 +68,7 @@
                       </form>            
 					  
                     {% else %}
-					 <form role="form" id="billing-form" method="post" action="{% url 'digitalglarus:TermsAndConditions' %}" novalidate>
+					 <form role="form" id="billing-form" method="post" action="{% url 'digitalglarus:booking_payment' %}" novalidate>
 						 {% csrf_token %}
                         <h2 class="membership-lead">Last 4: *****{{last4}}</h2>
                         <h2 class="membership-lead">Type: {{cc_brand}}</h2>
@@ -81,12 +77,16 @@
                     <h2 class="billing-head">Credit Card (New One)</h2>
                     <div class="signup-form form-group row">
 					 
-                            <form role="form" id="payment-form" novalidate>
-							 {% csrf_token %}
+					 
+					 
+					 
+					 
+					  <form role="form" id="payment-form" novalidate>
+					   {% csrf_token %}
                                 <div class="row">
                                     <div class="col-xs-12 col-md-12">
                                         <div class="form-group">
-                                                <input for="name" type="text" class="form-control" name="cardName" placeholder="Name on card" required autofocus data-stripe="name" />
+                                                <input type="text" class="form-control" name="cardName" placeholder="Name on card" required autofocus data-stripe="name" />
                                         </div>                            
                                     </div>
                                 </div>
@@ -98,7 +98,7 @@
                                     </div>
                                 </div>
                                 <div class="row">
-                                    <div class="col-xs-6 col-md-6 nopadding">
+                                    <div class="col-xs-12 col-md-6 nopadding">
                                       <label for="expMonth">EXPIRATION DATE</label><br/>
                                       <div class="col-xs-6 col-lg-6 col-md-6">
                                         <div class="form-group">
@@ -111,30 +111,28 @@
                                         </div>
                                       </div>
                                     </div>
-                                    <div class="col-xs-4 col-md-6 pull-right">
+                                    <div class="col-xs-12 col-md-6 pull-right">
                                         <div class="form-group">
                                             <label for="cvCode">CV CODE</label>
                                             <input type="password" class="form-control" name="cvCode" placeholder="CV" required data-stripe="cvc" />
                                         </div>
                                     </div>
-									
-									<div class="text-center">
-										
-									</div>
+
                                 </div>
 								<input type="checkbox" hidden="True" class="custom-control-input agree-terms" checked>
-								<div class="row">
-                                    <div class="row">
+                                <div class="row">
+                                    
+                                    
                                       <div class="col-xs-6 col-md-6 col-xs-offset-1 col-md-offset-3">
-										 <a class="btn btn-primary btn-grey"  href="{% url 'digitalglarus:booking_payment' %}">Go to my page</a>
+                                          
+							
+										 <a class="btn btn-primary btn-grey" href="{% url 'digitalglarus:booking_payment' %}">Cancel</a>
    
 										   <button class="btn btn-primary btn-md btn-blck submit-payment" type="submit">Save</button>
+                                      
                                       </div>
-                                    </div>
+                                    
                                 </div>
-								
-								
-								
                                 <div class="row" style="display:none;">
                                     <div class="col-xs-12">
                                         <p class="payment-errors"></p>
@@ -148,10 +146,8 @@
                                       </p>
                                     </div>
                                 </div>
-								
-					
-
                                 {% endif %}
+
                             </form>
                         <br>
                     </div>