Improved navigation design