Updated grid

Added wrapping containers for header and form