more layout fixing