GH21 - added the property type
GH21 - Add the functionality to the button in stringwithbuttonClass
GH21 - Resolved pull request code review