Restructured navigation design