Renamed some template files, made the right nav work