Minor bugfixes in menu
Introduced sub_menu structure
added debug information