better layout of menu options, also fixes #53