diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html
index 7dbda725672e6bee4b99907ac61e05ef184aedbe..93c3fb9d57eeaeb60f8b16ef39389a1bf4ec924c 100644
--- a/smash/web/templates/doctors/add.html
+++ b/smash/web/templates/doctors/add.html
@@ -42,7 +42,7 @@
   					</label>
 
   					<div class="col-sm-10">
-  						{{ field|add_class:'form-control disabled' }}
+  						{{ field|add_class:'form-control' }}
   					</div>
 
             {% if field.errors %}
diff --git a/smash/web/templates/doctors/details.html b/smash/web/templates/doctors/details.html
index 2441c3f187570fef93193c39081e85a037856a7d..dfc9a99b4a2e638875b9335fc948da6676e8e950 100644
--- a/smash/web/templates/doctors/details.html
+++ b/smash/web/templates/doctors/details.html
@@ -34,25 +34,23 @@
 		{% csrf_token %}
 
 		<div class="box-body">
-      <div class="col-sm-6">
-  			{% for field in form %}
-  				<div class="form-group  {% if field.errors %}has-error{% endif %}">
-  					<label for="{# TODO #}" class="col-sm-2 control-label">
-  						{{ field.label }}
-  					</label>
-
-  					<div class="col-sm-10">
-  						{{ field|add_class:'form-control' }}
-  					</div>
-
-            {% if field.errors %}
-              <span class="help-block">
-                {{ field.errors }}
-              </span>
-            {% endif %}
-  				</div>
-  			{% endfor %}
-      </div>
+			{% for field in form %}
+				<div class="col-md-6 form-group  {% if field.errors %}has-error{% endif %}">
+					<label for="{# TODO #}" class="col-sm-4 control-label">
+						{{ field.label }}
+					</label>
+
+					<div class="col-sm-8">
+						{{ field|disable|add_class:'form-control' }}
+					</div>
+
+          {% if field.errors %}
+            <span class="help-block">
+              {{ field.errors }}
+            </span>
+          {% endif %}
+				</div>
+			{% endfor %}
 		</div><!-- /.box-body -->
 
 		<div class="box-footer">
diff --git a/smash/web/templates/doctors/edit.html b/smash/web/templates/doctors/edit.html
index 69c9bd0cdffe20a0b2a5b6fbaa7fc4306a05a5a0..31d518dfbd1428b25ad248bb05e7a296e27cfead 100644
--- a/smash/web/templates/doctors/edit.html
+++ b/smash/web/templates/doctors/edit.html
@@ -34,25 +34,23 @@
 		{% csrf_token %}
 
 		<div class="box-body">
-      <div class="col-sm-6">
-  			{% for field in form %}
-  				<div class="form-group  {% if field.errors %}has-error{% endif %}">
-  					<label for="{# TODO #}" class="col-sm-2 control-label">
-  						{{ field.label }}
-  					</label>
-
-  					<div class="col-sm-10">
-  						{{ field|add_class:'form-control' }}
-  					</div>
-
-            {% if field.errors %}
-              <span class="help-block">
-                {{ field.errors }}
-              </span>
-            {% endif %}
-  				</div>
-  			{% endfor %}
-      </div>
+			{% for field in form %}
+				<div class="col-md-6 form-group  {% if field.errors %}has-error{% endif %}">
+					<label for="{# TODO #}" class="col-sm-4 control-label">
+						{{ field.label }}
+					</label>
+
+					<div class="col-sm-8">
+						{{ field|add_class:'form-control' }}
+					</div>
+
+          {% if field.errors %}
+            <span class="help-block">
+              {{ field.errors }}
+            </span>
+          {% endif %}
+				</div>
+			{% endfor %}
 		</div><!-- /.box-body -->
 
 		<div class="box-footer">
diff --git a/smash/web/templates/subjects/details.html b/smash/web/templates/subjects/details.html
index 220bfb19e9270f3110ac67a75cc365108d933bbc..7f7be5f5bc0126c25394de239c7e2bda8e6e766c 100644
--- a/smash/web/templates/subjects/details.html
+++ b/smash/web/templates/subjects/details.html
@@ -32,25 +32,23 @@
 
 	<form class="form-horizontal">
 		<div class="box-body">
-      <div class="col-sm-6">
-  			{% for field in form %}
-  				<div class="form-group {% if field.errors %}has-error{% endif %}">
-  					<label for="{# TODO #}" class="col-sm-2 control-label">
-  						{{ field.label }}
-  					</label>
-
-  					<div class="col-sm-10">
-  						{{ field|add_class:'form-control' }}
-  					</div>
-
-            {% if field.errors %}
-              <span class="help-block">
-                {{ field.errors }}
-              </span>
-            {% endif %}
-  				</div>
-  			{% endfor %}
-      </div>
+			{% for field in form %}
+				<div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
+					<label for="{# TODO #}" class="col-sm-4 control-label">
+						{{ field.label }}
+					</label>
+
+					<div class="col-sm-8">
+            {{ field|disable|add_class:'form-control' }}
+					</div>
+
+          {% if field.errors %}
+            <span class="help-block">
+              {{ field.errors }}
+            </span>
+          {% endif %}
+				</div>
+			{% endfor %}
 		</div><!-- /.box-body -->
 
 		<div class="box-footer">
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index a700753873f949aa0ba4ad2936b9395a160d15ab..387edb65e195e083a214d2ece8d70cc63bcf4d20 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -34,25 +34,23 @@
 		{% csrf_token %}
 
 		<div class="box-body">
-      <div class="col-sm-6">
-  			{% for field in form %}
-  				<div class="form-group  {% if field.errors %}has-error{% endif %}">
-  					<label for="{# TODO #}" class="col-sm-2 control-label">
-  						{{ field.label }}
-  					</label>
-
-  					<div class="col-sm-10">
-  						{{ field|add_class:'form-control' }}
-  					</div>
-
-            {% if field.errors %}
-              <span class="help-block">
-                {{ field.errors }}
-              </span>
-            {% endif %}
-  				</div>
-  			{% endfor %}
-      </div>
+			{% for field in form %}
+				<div class="col-md-6 form-group  {% if field.errors %}has-error{% endif %}">
+					<label for="{# TODO #}" class="col-sm-4 control-label">
+						{{ field.label }}
+					</label>
+
+					<div class="col-sm-8">
+						{{ field|add_class:'form-control' }}
+					</div>
+
+          {% if field.errors %}
+            <span class="help-block">
+              {{ field.errors }}
+            </span>
+          {% endif %}
+				</div>
+			{% endfor %}
 		</div><!-- /.box-body -->
 
 		<div class="box-footer">
diff --git a/todos.txt b/todos.txt
index 40eb2ae7ce90165721281b16765eae2687f66fa6..e7d8c80581e17d557c7e4a86c5311fe06638a85a 100644
--- a/todos.txt
+++ b/todos.txt
@@ -7,9 +7,8 @@
  - make some names sound/look more pythonic
 
 ** Visual
- - all html forms - make them more "bootstrap'y"
- - make fields in details not editable	
+ - None
 
 ** Possible improvements
 - breadcrumbs - make them stack (multiple template inheritance?)
-- label for's => give them correct html id's (all html forms)
\ No newline at end of file
+- label for's => give them correct html id's (all html forms)