small pep8 fixes
Big refactoring in menus