Add proper map rendering logic to dashboard (need to refactor though)