some layout fixes...