#19 Rework menu and more stuff, part 2