fix(SW-2345): ui fixes for map etc * fix(SW-2345): ui fixes for map etc Approved-by: Anton Gunnarsson