Some layout fixes.