Refactoring + Fixed menues