Added dsahboard and map