Fixes more buttons layout issues
Merge branch 'fix/buttons' into develop

* fix/buttons:
  Fixes more buttons layout issues