More layout fixes.