More layout fixes