Index: oceandb/webapproot/WEB-INF/project-managers.xml
===================================================================
--- oceandb/webapproot/WEB-INF/project-managers.xml	(revision 47)
+++ oceandb/webapproot/WEB-INF/project-managers.xml	(revision 48)
@@ -1,25 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Server-side manager bean definitions.  These are only to be used at runtime.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:aop="http://www.springframework.org/schema/aop"
-        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                http://www.springframework.org/schema/aop
-                http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-
-    <!-- extend beans to have the proper names; add in server-specific information -->
-    <bean id="serviceManager"
-            class="com.wavemaker.runtime.service.ServiceManager"
-            scope="singleton"
-            lazy-init="true"
-            parent="serviceManagerBase">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<beans xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans">
+    <bean scope="singleton" parent="serviceManagerBase" class="com.wavemaker.runtime.service.ServiceManager" id="serviceManager">
         <property name="services">
             <list merge="true">
+                <value>runtimeService</value>
             </list>
         </property>
     </bean>
+    <bean scope="singleton" parent="typeManagerBase" class="com.wavemaker.runtime.service.TypeManager" id="typeManager">
+        <property name="types">
+            <map merge="true">
+                <entry key="runtimeService">
+                    <list>
+                        <value>com.wavemaker.runtime.service.PagingOptions</value>
+                        <value>com.wavemaker.runtime.service.PropertyOptions</value>
+                    </list>
+                </entry>
+            </map>
+        </property>
+    </bean>
 </beans>
Index: oceandb/webapproot/WEB-INF/project-services.xml
===================================================================
--- oceandb/webapproot/WEB-INF/project-services.xml	(revision 47)
+++ oceandb/webapproot/WEB-INF/project-services.xml	(revision 48)
@@ -1,12 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Server definition of all services; 
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<beans xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans">
+    <import resource="classpath:com/wavemaker/runtime/service/runtimeServiceBean.xml"/>
 </beans>
Index: oceandb/webapproot/lib_project.js
===================================================================
--- oceandb/webapproot/lib_project.js	(revision 47)
+++ oceandb/webapproot/lib_project.js	(revision 48)
@@ -1,5 +1,5 @@
 if (djConfig.debugBoot) {
 	wm.loadScripts([
-
+		"pages/Main/Main.js"
 	]);
 }
Index: oceandb/webapproot/pages/Main/Main.widgets.js
===================================================================
--- oceandb/webapproot/pages/Main/Main.widgets.js	(revision 47)
+++ oceandb/webapproot/pages/Main/Main.widgets.js	(revision 48)
@@ -1,3 +1,38 @@
 Main.widgets = {
-	layoutBox1: ["wm.Layout", {box: "v", height: "1flex"}, {}]
+	layoutBox1: ["wm.Layout", {box: "v", height: "1flex"}, {}, {
+		template1: ["wm.Template", {height: "96px"}, {}, {
+			header: ["wm.Panel", {_classes: {domNode: ["wm_Padding_8px", "wm_SilverBlueTheme_LightBlueInsetPanel"]}, box: "h", height: "78px", boxPosition: "topLeft"}, {}, {
+				panel4: ["wm.Panel", {box: "v", width: "1flex"}, {}, {
+					chineseheader: ["wm.Label", {_classes: {domNode: ["wm_FontFamily_Verdana", "wm_FontSize_300percent"]}, caption: "台灣海洋資訊資料庫聯盟網", link: "http://oceandb.info", height: "48px"}, {}, {
+						format: ["wm.DataFormatter", {}, {}]
+					}],
+					englishheader: ["wm.Label", {_classes: {domNode: ["wm_FontFamily_Verdana", "wm_FontSize_150percent", "wm_TextDecoration_Bold", "wm_TextDecoration_Underline", "wm_FontColor_LightGray"]}, caption: "Taiwan Ocean Informatioan Database", height: "16px"}, {}, {
+						format: ["wm.DataFormatter", {}, {}]
+					}]
+				}],
+				logo: ["wm.Picture", {source: "http://www.tori.narl.org.tw/images/tori_logo.png", aspect: "v", link: "http://www.tori.narl.org.tw", autoSize: true}, {}]
+			}]
+		}],
+		template2: ["wm.Template", {height: "1flex"}, {}, {
+			toolbar: ["wm.Panel", {_classes: {domNode: ["wm_SilverBlueTheme_ToolBar"]}, box: "h", height: "26px"}, {}, {
+				home: ["wm.Button", {_classes: {domNode: ["wm_TextDecoration_Bold", "wm_FontSize_120percent", "wm_FontFamily_Verdana", "wm_TextAlign_Center"]}, width: "63px", caption: "HOME"}, {}],
+				spacer1: ["wm.Spacer", {width: "10px"}, {}],
+				news: ["wm.Button", {_classes: {domNode: ["wm_FontFamily_Verdana", "wm_FontSize_120percent", "wm_TextDecoration_Bold", "wm_TextAlign_Center"]}, width: "62px", caption: "NEWS"}, {}],
+				spacer2: ["wm.Spacer", {width: "10px"}, {}],
+				about: ["wm.Button", {_classes: {domNode: ["wm_TextAlign_Center", "wm_TextDecoration_Bold", "wm_FontSize_120percent", "wm_FontFamily_Verdana"]}, width: "69px", caption: "ABOUT"}, {}]
+			}],
+			main: ["wm.Panel", {box: "h", height: "1flex"}, {}, {
+				menu: ["wm.Panel", {_classes: {domNode: ["wm_SilverBlueTheme_LightBlueInsetPanel"]}, box: "v", width: "246px"}, {}],
+				splitter1: ["wm.Splitter", {width: "6px"}, {}],
+				map: ["wm.Panel", {_classes: {domNode: ["wm_SilverBlueTheme_MainInsetPanel"]}, box: "v", width: "1flex"}, {}]
+			}]
+		}],
+		template3: ["wm.Template", {height: "29px"}, {}, {
+			footer: ["wm.Panel", {_classes: {domNode: ["wm_SilverBlueTheme_LightBlueInsetPanel"]}, box: "h", height: "20px", boxPosition: "center"}, {}, {
+				footerLabel: ["wm.Label", {_classes: {domNode: ["wm_FontColor_Blue", "wm_TextDecoration_Bold", "wm_FontSize_120percent", "wm_FontFamily_Verdana"]}, caption: "Copyright 2008 TORI & NCHC, NARL, Taiwan", width: "315px", height: "", autoSize: true}, {}, {
+					format: ["wm.DataFormatter", {}, {}]
+				}]
+			}]
+		}]
+	}]
 }