Replaced switch-case to map. Still missing margin grids maps