add some responsive button margin
Merge branch 'fixes' into develop