Fixed navigation problem. And minor changes/fixes..