Added more rows, and ~sorted out margin problem