fixed problems with navigation