Refactor/foursquare views