Remove extra navigation lol
Fix some navigation problems etc