Separate menu into menu and submenu
Removed commented method
Moved unit test