New Form Layout: Square CC fields are not aligned well