Fixed recent layout bugs.