New style components + adjustments