Added better default templates and routing