Fixed nav issues and linked pages