added conditionals to fix double nav displaying