Added button description option
Code refactoring