=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java	2013-09-09 12:45:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java	2013-09-09 18:40:14 +0000
@@ -55,7 +55,7 @@
 public class DashboardItem
     extends BaseIdentifiableObject
 {
-    public static final int MAX_CONTENT = 9;
+    public static final int MAX_CONTENT = 8;
 
     public static final String TYPE_CHART = "chart";
     public static final String TYPE_MAP = "map";

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml	2013-05-27 12:47:46 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml	2013-09-09 18:40:14 +0000
@@ -18,7 +18,7 @@
 
     <property name="lastUpdated" type="timestamp" />
 
-    <property name="layer" />
+    <property name="layer" not-null="true" />
 
     <property name="valueType" />