Added menu

Menu + refactoring