Fixed a few more layout bugs.