diff --git a/Core/Core.cc b/Core/Core.cc
index 8405c8aea17ef94efea00150ad13d556204820ad..fbff5ff049d033a4cf99102ee10c46b96f8944c2 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -138,7 +138,7 @@ Core() :
   ViewMode* vm = new ViewMode();
   vm->name = "All";
   vm->custom = false;
-  vm->visibleWidgets = QStringList();
+  vm->visibleToolboxes = QStringList();
 
   viewModes_.push_front(vm);
 
diff --git a/Core/ParseIni.cc b/Core/ParseIni.cc
index 9644aa5fcd807ffe5e92d14023f1f7307fd0fc60..647ecf5312e4b04b5a6a1a1af21082231da2f622 100644
--- a/Core/ParseIni.cc
+++ b/Core/ParseIni.cc
@@ -98,7 +98,7 @@ void Core::readApplicationOptions(INIFile& _ini) {
           ViewMode* vm = new ViewMode();
           vm->name = mode;
           vm->custom = true;
-          vm->visibleWidgets = widgets;
+          vm->visibleToolboxes = widgets;
           viewModes_.push_back(vm);
         }
 
@@ -493,8 +493,8 @@ void Core::writeApplicationOptions(INIFile& _ini) {
         QString entry = coreWidget_->viewModes_[i]->name;
 
         //store widgets
-        for (int j=0; j < coreWidget_->viewModes_[i]->visibleWidgets.size(); j++)
-          entry += ";" + coreWidget_->viewModes_[i]->visibleWidgets[j];
+        for (int j=0; j < coreWidget_->viewModes_[i]->visibleToolboxes.size(); j++)
+          entry += ";" + coreWidget_->viewModes_[i]->visibleToolboxes[j];
 
         entries.push_back(entry);
       }
diff --git a/Core/PluginLoader.cc b/Core/PluginLoader.cc
index 89e113e83178b44b8804743061071139d15fbc94..1b0f2181de5b728ce4b9811a59964ce7d6fc73ff 100644
--- a/Core/PluginLoader.cc
+++ b/Core/PluginLoader.cc
@@ -309,8 +309,8 @@ void Core::unloadPlugin(QString name){
       //remove toolbox widget
       QString name_nospace = name;
       name_nospace.remove(" ");
-      if ( coreWidget_->viewModes_[0]->visibleWidgets.contains(name_nospace) )
-        coreWidget_->viewModes_[0]->visibleWidgets.removeAt(coreWidget_->viewModes_[0]->visibleWidgets.indexOf(name_nospace));
+      if ( coreWidget_->viewModes_[0]->visibleToolboxes.contains(name_nospace) )
+        coreWidget_->viewModes_[0]->visibleToolboxes.removeAt(coreWidget_->viewModes_[0]->visibleToolboxes.indexOf(name_nospace));
       for ( uint j = 0 ; j < plugins[i].widgets.size() ; ++j )
         if (plugins[i].widgets[j].second ){
           plugins[i].widgets[j].second->setVisible(false);
@@ -597,9 +597,9 @@ void Core::loadPlugin(QString filename, bool silent){
             info.widgets.push_back( std::pair< QString,QWidget* >( info.name , widget) );
 
             // add widget name to viewMode 'all'
-            if ( !viewModes_[0]->visibleWidgets.contains(info.name) ){
-              viewModes_[0]->visibleWidgets << info.name;
-              viewModes_[0]->visibleWidgets.sort();
+            if ( !viewModes_[0]->visibleToolboxes.contains(info.name) ){
+              viewModes_[0]->visibleToolboxes << info.name;
+              viewModes_[0]->visibleToolboxes.sort();
             }
       }
 
diff --git a/Core/scripting.cc b/Core/scripting.cc
index 46aff381a7bd2fc84ef64162344d63a8a888d1ff..4ea6fd0f3e9782650bf18c0aa79504978cf024b6 100644
--- a/Core/scripting.cc
+++ b/Core/scripting.cc
@@ -168,9 +168,9 @@ void Core::addToolbox(QString _name ,QWidget* _widget) {
   plugins[id].widgets.push_back( std::pair< QString,QWidget* >( _name , _widget) );
 
   // add widget name to viewMode 'all'
-  if ( !viewModes_[0]->visibleWidgets.contains(_name) ){
-    viewModes_[0]->visibleWidgets << _name;
-    viewModes_[0]->visibleWidgets.sort();
+  if ( !viewModes_[0]->visibleToolboxes.contains(_name) ){
+    viewModes_[0]->visibleToolboxes << _name;
+    viewModes_[0]->visibleToolboxes.sort();
   }
 
   setViewMode( OpenFlipper::Options::defaultToolboxMode() );
diff --git a/widgets/coreWidget/CoreWidget.hh b/widgets/coreWidget/CoreWidget.hh
index fbdf60adcd38c2489cd56833c353d74979c594c6..036a37cc5ec51433a35b2752f34f1d59b575ebe5 100644
--- a/widgets/coreWidget/CoreWidget.hh
+++ b/widgets/coreWidget/CoreWidget.hh
@@ -97,11 +97,26 @@
 #include <OpenFlipper/INIFile/INIFile.hh>
 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 
-
+/** \brief ViewMode struct
+* This struct contains a ViewMode and its status information such as used widgets,toolbars or context menus
+*
+*/
 struct ViewMode{
-      QString name;
-      bool custom; //is the mode defined by the user?
-      QStringList visibleWidgets;
+  
+  /// Name of the View Mode
+  QString name;
+  
+  /// Is this a user defined custom view mode or a plugin generated one
+  bool custom;
+  
+  /// List of Visible Toolboxes in this view mode
+  QStringList visibleToolboxes;
+  
+  /// List of Toolbars in this view mode
+  QStringList visibleToolbars;
+  
+  /// List of context Menus in this view mode
+  QStringList visibleContextMenus;
 };
 
 class StackWidgetInfo {
diff --git a/widgets/coreWidget/viewMode.cc b/widgets/coreWidget/viewMode.cc
index 4bb540e1fb7af78f140d83dea7711b4fd3310661..08925644696db1f7bc3c17697f06eac3d2206750 100644
--- a/widgets/coreWidget/viewMode.cc
+++ b/widgets/coreWidget/viewMode.cc
@@ -96,7 +96,7 @@ void CoreWidget::slotAddViewMode(QString _mode, bool _custom, QStringList _usedW
   ViewMode* vm = new ViewMode();
   vm->name = _mode;
   vm->custom = _custom;
-  vm->visibleWidgets = _usedWidgets;
+  vm->visibleToolboxes = _usedWidgets;
   if (_custom)
     viewModes_.push_back(vm);
   else{
@@ -162,7 +162,7 @@ void CoreWidget::slotChangeView(QString _mode, QStringList _toolWidgets){
   if (_mode != "" && _toolWidgets.size() == 0)
     for (int i=0; i < viewModes_.size(); i++)
       if (viewModes_[i]->name == _mode)
-        _toolWidgets = viewModes_[i]->visibleWidgets;
+        _toolWidgets = viewModes_[i]->visibleToolboxes;
 
   // remove all toolbox entries
   toolBox_->clear ();
diff --git a/widgets/viewModeWidget/viewModeWidget.cc b/widgets/viewModeWidget/viewModeWidget.cc
index 0f3d88618bb4a3ce9ba55e903f642a617e1ae3c9..5e4bf0a76105476d907efd4ffa99bf01c63f53d4 100644
--- a/widgets/viewModeWidget/viewModeWidget.cc
+++ b/widgets/viewModeWidget/viewModeWidget.cc
@@ -217,7 +217,7 @@ void viewModeWidget::slotSetToolWidgets(){
     // find mode in modeVector modes_
     for (int i=0; i < modes_.size(); i++)
       if ( modes_[i]->name == (modeList->selectedItems()[m])->text() )
-        toolList->addItems(modes_[i]->visibleWidgets); //add corresponding widgets
+        toolList->addItems(modes_[i]->visibleToolboxes); //add corresponding widgets
 }
 
 /// Slot for changing View and closing widget