diff --git a/src/app/admin/template/project_group.html b/src/app/admin/template/project_group.html
index c3fa0d9b..2cc43569 100644
--- a/src/app/admin/template/project_group.html
+++ b/src/app/admin/template/project_group.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
 
     <div class="row">
         <div class="col-xs-12">
diff --git a/src/app/admin/template/project_group_edit.html b/src/app/admin/template/project_group_edit.html
index 1dfa5d62..e2f851ba 100644
--- a/src/app/admin/template/project_group_edit.html
+++ b/src/app/admin/template/project_group_edit.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1><i class="fa fa-sb-project-group"></i> {{projectGroup.title}}
diff --git a/src/app/admin/template/team.html b/src/app/admin/template/team.html
index f0476d4d..aaf35d18 100644
--- a/src/app/admin/template/team.html
+++ b/src/app/admin/template/team.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1><i class="fa fa-sb-team"></i> Teams</h1>
diff --git a/src/app/admin/template/team_edit.html b/src/app/admin/template/team_edit.html
index ecf6ac93..0d5ba41e 100644
--- a/src/app/admin/template/team_edit.html
+++ b/src/app/admin/template/team_edit.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1><i class="fa fa-sb-team"></i> Edit Team</h1>
diff --git a/src/app/admin/template/user.html b/src/app/admin/template/user.html
index 89507123..dfc0451e 100644
--- a/src/app/admin/template/user.html
+++ b/src/app/admin/template/user.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
 
     <div class="row">
         <div class="col-xs-12">
diff --git a/src/app/admin/template/user_edit.html b/src/app/admin/template/user_edit.html
index 03f30db4..a4ad17c7 100644
--- a/src/app/admin/template/user_edit.html
+++ b/src/app/admin/template/user_edit.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1><i class="fa fa-sb-user"></i> {{user.full_name}}</h1>
diff --git a/src/app/auth/template/busy.html b/src/app/auth/template/busy.html
index 701aeedb..56f851cd 100644
--- a/src/app/auth/template/busy.html
+++ b/src/app/auth/template/busy.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <p class="text-center text-muted">
diff --git a/src/app/auth/template/error.html b/src/app/auth/template/error.html
index 7e9dedf3..fdb373b4 100644
--- a/src/app/auth/template/error.html
+++ b/src/app/auth/template/error.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1>Oh no!</h1>
diff --git a/src/app/dashboard/template/dashboard.html b/src/app/dashboard/template/dashboard.html
index b01d9ca1..8dc824fe 100644
--- a/src/app/dashboard/template/dashboard.html
+++ b/src/app/dashboard/template/dashboard.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-sm-12">
             <h1>Dashboard</h1>
diff --git a/src/app/dashboard/template/index.html b/src/app/dashboard/template/index.html
index eb568643..be1f95e6 100644
--- a/src/app/dashboard/template/index.html
+++ b/src/app/dashboard/template/index.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-sm-12">
             <h1>StoryBoard</h1>
diff --git a/src/app/pages/template/about.html b/src/app/pages/template/about.html
index 0dd34f95..213036a6 100644
--- a/src/app/pages/template/about.html
+++ b/src/app/pages/template/about.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1>StoryBoard</h1>
diff --git a/src/app/profile/template/preferences.html b/src/app/profile/template/preferences.html
index d157e3d6..2cb3f349 100644
--- a/src/app/profile/template/preferences.html
+++ b/src/app/profile/template/preferences.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container" ng-hide="isLoading">
+<div class="container-fluid" ng-hide="isLoading">
     <div class="row">
         <div class="col-xs-12">
             <h1><i class="fa fa-sb-profile-preferences"
diff --git a/src/app/profile/template/tokens.html b/src/app/profile/template/tokens.html
index 2ede3410..9bfeaec8 100644
--- a/src/app/profile/template/tokens.html
+++ b/src/app/profile/template/tokens.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container" ng-hide="isLoading">
+<div class="container-fluid" ng-hide="isLoading">
     <div class="row">
         <div class="col-xs-12">
             <h1><i class="fa fa-sb-profile-tokens"></i> Authentication
diff --git a/src/app/project_group/template/detail.html b/src/app/project_group/template/detail.html
index 871eb858..833a3e32 100644
--- a/src/app/project_group/template/detail.html
+++ b/src/app/project_group/template/detail.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1>
diff --git a/src/app/project_group/template/list.html b/src/app/project_group/template/list.html
index f84caaa4..36f8c436 100644
--- a/src/app/project_group/template/list.html
+++ b/src/app/project_group/template/list.html
@@ -13,7 +13,7 @@
   ~ License for the specific language governing permissions and limitations
   ~ under the License.
   -->
-<div class="container"
+<div class="container-fluid"
      ng-controller="SearchCriteriaController"
      ng-init="init(resourceTypes, defaultCriteria)"
      search-results
diff --git a/src/app/projects/template/detail.html b/src/app/projects/template/detail.html
index 199727bf..a69365da 100644
--- a/src/app/projects/template/detail.html
+++ b/src/app/projects/template/detail.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div ng-include
              class="col-xs-12"
diff --git a/src/app/projects/template/list.html b/src/app/projects/template/list.html
index 67f441f5..caf4b330 100644
--- a/src/app/projects/template/list.html
+++ b/src/app/projects/template/list.html
@@ -13,7 +13,7 @@
   ~ License for the specific language governing permissions and limitations
   ~ under the License.
   -->
-<div class="container"
+<div class="container-fluid"
      ng-controller="SearchCriteriaController"
      ng-init="init(resourceTypes, defaultCriteria)"
      search-results
diff --git a/src/app/projects/template/new.html b/src/app/projects/template/new.html
index bc0c60ff..b0812794 100644
--- a/src/app/projects/template/new.html
+++ b/src/app/projects/template/new.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <h1>New Project</h1>
diff --git a/src/app/search/template/index.html b/src/app/search/template/index.html
index deda0b5d..2bd99f95 100644
--- a/src/app/search/template/index.html
+++ b/src/app/search/template/index.html
@@ -13,7 +13,7 @@
   ~ License for the specific language governing permissions and limitations
   ~ under the License.
   -->
-<div class="container" ng-controller="SearchCriteriaController"
+<div class="container-fluid" ng-controller="SearchCriteriaController"
      ng-init="init(resourceTypes, defaultCriteria)">
     <div class="row">
         <div class="col-xs-12">
diff --git a/src/app/stories/template/detail.html b/src/app/stories/template/detail.html
index 7ccd09dd..7e2bb215 100644
--- a/src/app/stories/template/detail.html
+++ b/src/app/stories/template/detail.html
@@ -14,7 +14,7 @@
   ~ under the License.
   -->
 
-<div class="container">
+<div class="container-fluid">
     <div class="row">
         <div class="col-xs-12">
             <div ng-include
diff --git a/src/app/stories/template/list.html b/src/app/stories/template/list.html
index e1f827ec..06d30bb3 100644
--- a/src/app/stories/template/list.html
+++ b/src/app/stories/template/list.html
@@ -13,7 +13,7 @@
   ~ License for the specific language governing permissions and limitations
   ~ under the License.
   -->
-<div class="container"
+<div class="container-fluid"
      ng-controller="SearchCriteriaController"
      ng-init="init(resourceTypes, defaultCriteria)"
      search-results
diff --git a/src/index.html b/src/index.html
index e6c663fd..1cd88cf6 100644
--- a/src/index.html
+++ b/src/index.html
@@ -51,7 +51,7 @@
 <header ng-include src="'app/storyboard/template/header_menu.html'"></header>
 <div ng-include src="'app/storyboard/template/side_menu.html'"></div>
 <div ng-if="isResolving">
-    <div class="container">
+    <div class="container-fluid">
         <div class="row">
             <div class="col-xs-12">
                 <p class="text-center text-muted">
diff --git a/src/theme/base/bootstrap_addons.less b/src/theme/base/bootstrap_addons.less
index 8001ed70..c24c9a91 100644
--- a/src/theme/base/bootstrap_addons.less
+++ b/src/theme/base/bootstrap_addons.less
@@ -203,3 +203,7 @@ td .form-group:last-child {
     right: (@grid-gutter-width / 2);
     bottom: @padding-base-horizontal;
 }
+
+div .container-fluid {
+    margin: 0% 5%;
+}