Added new icons for map view and fixed bugs