Feature/adwd 1142 map-button now active when mode=map