Restructure navigation