nav and misc cleanup