Updated controllers and added templating