added map view WIP