huge refactoring: removed model things from map view