refactored template files
navigation refactoring