fixed navigation
more fix