Worked on the menu a bit more

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>