Restructured an added Navigation