Mainly cosmetic and layout changes.