menu overhaul, changed map marker listing, added map to course lists
merge