some layout fixes..