Replaced nav link with real route and replaced some instance vars with local vars
Merge pull request #189 from tboerger/feature/cleanup

Replaced nav link with real route and replaced some instance vars with local vars