Moved the expand button to the right to make the indentation look less weird.

Previously we rendered the expand button out of sight because we no
longer always indent.