Setup menu and fixes #7