#16 Fixed navigation links and navigation bar in template
Refactoring.