Maps refactored, views refactored