Added controller, updated view