Cleaned some code, removed obsolete comments
Added new menu