Fixed the Grid and Navigation