Fix buggy layout

- Not a very smart layout, but should always be the right number
  of columns
- Didn't fix the history layout. Hoping to rework that anyway.