Adjusting HTML structure and grid