Fixed some merge errors + tested OverviewMenu + added and tested MapsMenu