Arrange button position in the preference panel
Merge branch 'develop'