Added Menu

Added menu and cleaned the code a little