Fixed a couple of layout bugs.