fixed button groups to match the mocks
Merge pull request #2499 from ten24/feature-4-buttonLayout

fixed button groups to match the mocks