some layout fixes