Updated solution for map modes does not fit in drawer