Layout improvement when the map contains a lot if different types