font on map page nav bar is changed
merge conflicts fixed
fixing merge conflicts
merge conflicts
username font is fixed
fixed username font