More layout fixes..