Move the expand/collapse icon to the left, and some other minor style tweaks