Remove margins, add spacer rows
Updated markup and styling to fix layout bugs