A few layout fixes.