diff --git a/css/graph.css b/css/graph.css
index f224603f..88acf5f8 100644
--- a/css/graph.css
+++ b/css/graph.css
@@ -1,14 +1,14 @@
-.recline-graph-container .graph {
+.recline-graph .graph {
   height: 500px;
   margin-right: 200px;
 }
 
-.recline-graph-container .legend table {
+.recline-graph .legend table {
   width: auto;
   margin-bottom: 0;
 }
 
-.recline-graph-container .legend td {
+.recline-graph .legend td {
   padding: 5px;
   line-height: 13px;
 }
@@ -17,34 +17,34 @@
   * Editor
   *********************************************************/
 
-.recline-graph-container .editor {
+.recline-graph .editor {
   float: right;
   width: 200px;
   padding-left: 0px;
 }
 
-.recline-graph-container .editor-info {
+.recline-graph .editor-info {
   padding-left: 4px;
 }
 
-.recline-graph-container .editor-info {
+.recline-graph .editor-info {
 	cursor: pointer;
 }
 
-.recline-graph-container .editor form {
+.recline-graph .editor form {
   padding-left: 4px;
 }
 
-.recline-graph-container .editor select {
+.recline-graph .editor select {
 	width: 100%;
 }
 
-.recline-graph-container .editor-info {
+.recline-graph .editor-info {
 	border-bottom: 1px solid #ddd;
 	margin-bottom: 10px;
 }
 
-.recline-graph-container .editor-hide-info p {
+.recline-graph .editor-hide-info p {
 	display: none;
 }
 
diff --git a/css/map.css b/css/map.css
index c8adde77..829d0c82 100644
--- a/css/map.css
+++ b/css/map.css
@@ -1,4 +1,4 @@
-.data-map-container .map {
+.recline-map .map {
   height: 500px;
 }
 
@@ -6,18 +6,18 @@
   * Editor
   *********************************************************/
 
-.data-map-container .editor {
+.recline-map .editor {
   float: right;
   width: 200px;
   padding-left: 0px;
   margin-left: 10px;
 }
 
-.data-map-container .editor form {
+.recline-map .editor form {
   padding-left: 4px;
 }
 
-.data-map-container .editor select {
+.recline-map .editor select {
 	width: 100%;
 }
 
diff --git a/src/view-graph.js b/src/view-graph.js
index 9e54d213..0bfbd007 100644
--- a/src/view-graph.js
+++ b/src/view-graph.js
@@ -23,7 +23,7 @@ this.recline.View = this.recline.View || {};
 my.Graph = Backbone.View.extend({
 
   tagName:  "div",
-  className: "recline-graph-container",
+  className: "recline-graph",
 
   template: ' \
   <div class="editor"> \
diff --git a/src/view-map.js b/src/view-map.js
index 93f9d039..8c9123fd 100644
--- a/src/view-map.js
+++ b/src/view-map.js
@@ -26,7 +26,7 @@ this.recline.View = this.recline.View || {};
 my.Map = Backbone.View.extend({
 
   tagName:  'div',
-  className: 'data-map-container',
+  className: 'recline-map',
 
   template: ' \
   <div class="editor"> \