A few layout fixes