Added selection of current page to nav links
Pulled the link model out