Fixed Navigation!
merging with jowim