Various layout changes.