Fixing heaps of stuff

Fixing some menu stuff + modularising some of the map actions