some layout fixing