clean up views and controllers, fix location calls