diff --git a/app/assets/stylesheets/asciicasts.sass b/app/assets/stylesheets/asciicasts.sass
index 3d67f01..09bb75c 100644
--- a/app/assets/stylesheets/asciicasts.sass
+++ b/app/assets/stylesheets/asciicasts.sass
@@ -110,10 +110,3 @@
 
       h2
         font-size: 20px
-
-.asciicast-settings
-  form
-    .form-group
-      > div
-        width: 500px
-
diff --git a/app/assets/stylesheets/users.sass b/app/assets/stylesheets/users.sass
index 64ecc09..ebfa960 100644
--- a/app/assets/stylesheets/users.sass
+++ b/app/assets/stylesheets/users.sass
@@ -5,12 +5,6 @@
     #user_username
       width: 200px
 
-.account-settings
-  form
-    .form-group
-      > div
-        width: 500px
-
 .returning-user
   border-left: 1px solid #bbb
   padding-left: 30px
diff --git a/app/views/asciicasts/edit.html.slim b/app/views/asciicasts/edit.html.slim
index a989bcd..783a67f 100644
--- a/app/views/asciicasts/edit.html.slim
+++ b/app/views/asciicasts/edit.html.slim
@@ -1,10 +1,12 @@
-.container.asciicast-settings
-  = horizontal_form_for @asciicast do |f|
-    legend Asciicast properties
+.container
+  .row
+    .col-md-9
+      = horizontal_form_for @asciicast do |f|
+        legend Asciicast properties
 
-    = f.input :title
-    = f.input :description, as: :text, input_html: { rows: 10 }, hint: 'Parsed with <a href="http://github.github.com/github-flavored-markdown/" target="_blank">GitHub Flavored Markdown</a>'.html_safe
-    = f.input :theme_name, label: 'Terminal theme', collection: themes_for_select, include_blank: default_asciicast_theme_label(decorated_current_user.theme)
-    = f.buttons do
-      = f.button :submit, 'Save', class: 'btn-primary'
-      = link_to 'Cancel', asciicast_path, class: 'btn'
+        = f.input :title
+        = f.input :description, as: :text, input_html: { rows: 10 }, hint: 'Parsed with <a href="http://github.github.com/github-flavored-markdown/" target="_blank">GitHub Flavored Markdown</a>'.html_safe
+        = f.input :theme_name, label: 'Terminal theme', collection: themes_for_select, include_blank: default_asciicast_theme_label(decorated_current_user.theme)
+        = f.buttons do
+          = f.button :submit, 'Save', class: 'btn-primary'
+          = link_to 'Cancel', asciicast_path, class: 'btn'
diff --git a/app/views/users/edit.html.slim b/app/views/users/edit.html.slim
index 440d5a1..fcd2e8f 100644
--- a/app/views/users/edit.html.slim
+++ b/app/views/users/edit.html.slim
@@ -1,11 +1,13 @@
-.container.account-settings
-  = horizontal_form_for @user do |f|
-    legend Account settings
+.container
+  .row
+    .col-md-9
+      = horizontal_form_for @user do |f|
+        legend Account settings
 
-    = f.input :username
-    = f.input :email, required: true
-    = f.input :name, label: 'Real name'
-    = f.input :theme_name, label: 'Terminal theme', collection: themes_for_select, include_blank: default_user_theme_label, hint: 'Used for all recordings unless custom theme chosen for a specific recording'
-    = f.buttons do
-      = f.button :submit, 'Save', class: 'btn-primary'
-      = link_to 'Cancel', profile_path(current_user), class: 'btn'
+        = f.input :username
+        = f.input :email, required: true
+        = f.input :name, label: 'Real name'
+        = f.input :theme_name, label: 'Terminal theme', collection: themes_for_select, include_blank: default_user_theme_label, hint: 'Used for all recordings unless custom theme chosen for a specific recording'
+        = f.buttons do
+          = f.button :submit, 'Save', class: 'btn-primary'
+          = link_to 'Cancel', profile_path(current_user), class: 'btn'