Routes Bug fix and some template updates