Code refactoring + better menu items