More layout updates.