WIP: Making menus nicer
Improved objectives