fixed Navigation bugs