Changed the markup - added columns and rows