Added checks for navigation links.
Grid layout fix