some more layout fixing