Added location controller, added view