Fir for #304
Merge pull request #313 from Rise-Vision/issues/issue-304-button-styling

Fir for #304