Remove nav animation, fix some stuff