Made some layout changes to the list items.
Resolved merge conflicts.