Button height fix
Merge branch 'develop'