Revamp the markup and stucture using new grid layout