diff --git a/.sass-cache/537fb40b38351f28b6bdf09386ea293e12c7399b/bootstrap_and_overrides.css.scssc b/.sass-cache/537fb40b38351f28b6bdf09386ea293e12c7399b/bootstrap_and_overrides.css.scssc
new file mode 100644
index 0000000..d8d6d9a
Binary files /dev/null and b/.sass-cache/537fb40b38351f28b6bdf09386ea293e12c7399b/bootstrap_and_overrides.css.scssc differ
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 46f1298..b704c6d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,8 +12,8 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require twitter/bootstrap/bootstrap-button
-//= require twitter/bootstrap/bootstrap-modal
+// require twitter/bootstrap/bootstrap-button
+// require twitter/bootstrap/bootstrap-modal
 //= require utils
 //= require bootstrap-datepicker
 //= require bootstrap-timepicker
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 6b66844..221a607 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -10,6 +10,9 @@
  *
  *= require_self
  *= require datepicker
+ *= require bootstrap
+ *= require bootstrap-responsive
  *= require bootstrap-timepicker
  *= require bootstrap_and_overrides
+ *= require bootstrap-fontawesome
 */
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.scss b/app/assets/stylesheets/bootstrap_and_overrides.css.scss
new file mode 100644
index 0000000..891367e
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.scss
@@ -0,0 +1,31 @@
+body { 
+	padding-top: 60px;
+	padding-left: 20px;
+}
+
+
+// Set the correct sprite paths
+$iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
+$iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+
+// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
+// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not 
+//       have the proper paths. So for now we use the absolute path.
+$fontAwesomeEotPath: '/assets/fontawesome-webfont.eot';
+$fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff';
+$fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf';
+$fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg';
+
+[data-toggle="buttons-radio"] > .btn > input[type="radio"],
+[data-toggle="buttons"] > .btn > input[type="checkbox"] {
+  display: none;
+}
+
+.inline-block {
+  display: inline-block;
+}
+
+.control-group.error .btn-group > .btn {
+  color: #b94a48;
+  border-color: #b94a48;
+}