Refactor map view