bugfix and nav ehancement