diff --git a/logic/include/viewModel/image/ImageViewModel.h b/logic/include/viewModel/image/ImageViewModel.h
index 7583d86..66d60dc 100644
--- a/logic/include/viewModel/image/ImageViewModel.h
+++ b/logic/include/viewModel/image/ImageViewModel.h
@@ -72,7 +72,7 @@ private:
 
 	US_SWITCH_BUTTON_CUSTOM_SETTER_INTERNAL(quad, "Quad", "", true, true, false)
 
-    US_PROPERTY_VIEW_ONLY(bool, mModeEnable, false)
+    US_PROPERTY_VIEW_ONLY(bool, mModeEnable, true)
     US_PROPERTY_VIEW_ONLY(bool, mModeLineSelected, false)
 
 public:
diff --git a/logic/include/viewModel/tgc/TgcViewModel.h b/logic/include/viewModel/tgc/TgcViewModel.h
index bd73c67..06ad180 100644
--- a/logic/include/viewModel/tgc/TgcViewModel.h
+++ b/logic/include/viewModel/tgc/TgcViewModel.h
@@ -50,6 +50,11 @@ private:
 	US_PROPERTY_VIEW_ONLY(bool, enabled, true)
 
 	//Joysticks
+    US_PROPERTY_VIEW_ONLY(QString, nearField, "Near Field")
+    US_PROPERTY_VIEW_ONLY(QString, farField, "Far Field")
+    US_PROPERTY_VIEW_ONLY(QString, overalGain, "Overal Gain")
+    US_JOYSTICK_NUMBER(angle, "AO", "", "%", true, true, 0)
+
 
 };
 
diff --git a/logic/include/viewModel/user/UserViewModel.h b/logic/include/viewModel/user/UserViewModel.h
index 93cc42e..09f7afa 100644
--- a/logic/include/viewModel/user/UserViewModel.h
+++ b/logic/include/viewModel/user/UserViewModel.h
@@ -12,7 +12,7 @@ class UserViewModel : public BaseViewModel
 	SINGLETON(UserViewModel)
 
 private:
-	US_PROPERTY(EMenuTab::eMenuTab, activeTab, EMenuTab::B_TAB)
+    US_PROPERTY(EMenuTab::eMenuTab, activeTab, EMenuTab::M_TAB)
 
 	US_PROPERTY_VIEW_ONLY(bool, viewTGC, false)
     US_PROPERTY_CUSTOM_SETTER_INTERNAL(bool, viewMeasurement, false)
diff --git a/ui b/ui
index e8bd81e..f42205d 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit e8bd81e551edb1fde7a89c13fd33e1cbd978f817
+Subproject commit f42205d0d93358dfba05af310f61a64633a0cf30