Overhaul menu

The styling is a bit different, but it fixes #3