More layout fixing.