WIP on /dashboard/map and main page