Nav bug fix + proper menu for 404