Tweaked component blocks