Overdue commit of dashboard & map related stuff