Fixed locations, added dashboard views