KAZOO-2097: Change field label and button's position
Merge branch 'v3.07'