Updated pattern for navigation and grid