add some layout fixes