More Aesthetic changes

aligning all windows of subpatches, etc.