added better functionality to navigation and fixed some error links when moving between pages