Rearranged the fields on this block to match our UX pattern.