Rearranged rules and removed border right from field labels