MSINM-66: Improve map view mode