Minor tweak to map handling between full/small screen