user prefs
merge
clean up
merge
Fixed ship movement during ui clicks in navigation state