Fixed navigation both forward and backward