diff --git a/qglengine/core/glshaders_headers.h b/qglengine/core/glshaders_headers.h
index 333e870..de625aa 100644
--- a/qglengine/core/glshaders_headers.h
+++ b/qglengine/core/glshaders_headers.h
@@ -22,7 +22,7 @@
 namespace QGLEngineShaders {
 
 const int max_materials = 128;
-const int max_lights    = 64 ;
+const int max_lights    = 256 ;
 
 const char qgl_common_head[] =
 	"#version 400 core\n"
@@ -120,10 +120,10 @@ const char qgl_uniform[] =
 	"	QGLMaterial qgl_material[128];\n"
 	"};\n"
 	"layout (std140) uniform QGLLightParameterData {\n"
-	"	QGLLightParameter qgl_light_parameter[64];\n"
+	"	QGLLightParameter qgl_light_parameter[256];\n"
 	"};\n"
 	"layout (std140) uniform QGLLightPositionData {\n"
-	"	QGLLightPosition qgl_light_position[64];\n"
+	"	QGLLightPosition qgl_light_position[256];\n"
 	"};\n"
 	"uniform sampler2DArray qgl_texture_array[2];\n"
 	"";
diff --git a/qglengine/qglview.h b/qglengine/qglview.h
index 9b2ce13..9db9a25 100644
--- a/qglengine/qglview.h
+++ b/qglengine/qglview.h
@@ -141,6 +141,9 @@ public:
 	int renderMode() const {return (int)rmode;}
 	void setRenderMode(int mode) {rmode = (ObjectBase::RenderMode)mode;}
 
+	bool isServiceMode() const {return renderer_.edit_mode;}
+	void setServiceMode(bool yes) {renderer_.edit_mode = yes;}
+
 //	void addObject(GLObjectBase & o) {addObject(&o);}
 
 	Scene::SelectionMode selectionMode() const {return scene_->selectionMode();}
diff --git a/qglengine/qglview_test/qglview_window.h b/qglengine/qglview_test/qglview_window.h
index 841b70a..8017fe8 100644
--- a/qglengine/qglview_test/qglview_window.h
+++ b/qglengine/qglview_test/qglview_window.h
@@ -77,6 +77,7 @@ private slots:
 	void on_colorAmbient_colorChanged(QColor color) {view->view()->setAmbientColor(color);}
 	void on_checkCameraOrbit_clicked(bool val) {view->view()->setCameraOrbit(val);}
 	void on_checkCameraLight_clicked(bool val) {view->view()->setCameraLightOn(val);}
+	void on_checkService_clicked(bool val) {view->view()->setServiceMode(val);}
 
 	void on_groupShadows_clicked(bool val) {view->view()->setFeature(QGLView::qglShadowsEnabled, val);}
 	void on_groupEyeAccomodation_clicked(bool val) {view->view()->setFeature(QGLView::qglEyeAccomodationEnabled, val);}
diff --git a/qglengine/qglview_test/qglview_window.ui b/qglengine/qglview_test/qglview_window.ui
index 1eb8bc0..36c9e4a 100644
--- a/qglengine/qglview_test/qglview_window.ui
+++ b/qglengine/qglview_test/qglview_window.ui
@@ -211,14 +211,7 @@
                   </property>
                  </widget>
                 </item>
-                <item row="7" column="0" colspan="2">
-                 <widget class="QCheckBox" name="checkFXAA">
-                  <property name="text">
-                   <string>FXAA</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="8" column="0" colspan="2">
+                <item row="9" column="0" colspan="2">
                  <widget class="QGroupBox" name="groupHoverHalo">
                   <property name="title">
                    <string>Hover halo</string>
@@ -273,7 +266,7 @@
                   </layout>
                  </widget>
                 </item>
-                <item row="9" column="0" colspan="2">
+                <item row="10" column="0" colspan="2">
                  <widget class="QGroupBox" name="groupSelectionHalo">
                   <property name="title">
                    <string>Selection halo</string>
@@ -328,13 +321,13 @@
                   </layout>
                  </widget>
                 </item>
-                <item row="10" column="0" colspan="2">
+                <item row="11" column="0" colspan="2">
                  <widget class="QGroupBox" name="groupCamera">
                   <property name="title">
                    <string>Camera</string>
                   </property>
-                  <layout class="QFormLayout" name="formLayout_10">
-                   <item row="0" column="0" colspan="2">
+                  <layout class="QGridLayout" name="gridLayout">
+                   <item row="0" column="0">
                     <widget class="QCheckBox" name="checkCameraOrbit">
                      <property name="text">
                       <string>Orbit</string>
@@ -344,7 +337,7 @@
                      </property>
                     </widget>
                    </item>
-                   <item row="1" column="0" colspan="2">
+                   <item row="0" column="1">
                     <widget class="QCheckBox" name="checkCameraLight">
                      <property name="text">
                       <string>Camera Light</string>
@@ -358,14 +351,35 @@
                  </widget>
                 </item>
                 <item row="6" column="0" colspan="2">
-                 <widget class="QCheckBox" name="checkAutoExposure">
-                  <property name="text">
-                   <string>Auto exposure</string>
-                  </property>
-                  <property name="checked">
-                   <bool>true</bool>
-                  </property>
-                 </widget>
+                 <layout class="QGridLayout" name="gridLayout_2">
+                  <item row="1" column="0">
+                   <widget class="QCheckBox" name="checkFXAA">
+                    <property name="text">
+                     <string>FXAA</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QCheckBox" name="checkAutoExposure">
+                    <property name="text">
+                     <string>Auto exposure</string>
+                    </property>
+                    <property name="checked">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QCheckBox" name="checkService">
+                    <property name="text">
+                     <string>Service mode</string>
+                    </property>
+                    <property name="checked">
+                     <bool>true</bool>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
                 </item>
                </layout>
               </widget>