Added menu

Added menu and other minor fixes