Fixed layout bugs.