Added a start menu

Added a basic start menu and merged with your upstream changes.