Refactored routes and templates in core.clj