Moved map to map tab - still need to fix formatting for map ui elements