wrap content with grid-container, clean-up navigation-html