Merge branch...

Merge branch '219-design-new-layout-for-buttons-and-apply-wherever-required-to-be-consistent' into 'develop'

buttons and dropdown

See merge request !28