Menu, controllers, and map boundary

Commits 5fe92ea, 8800955, acdf414, f62ec60, and 3416bdf are offending commits.