Restructured Layout and Navigation