Improved the templates, models and routes.