Added ability for dynamic button generation
Revert "Added ability for dynamic button generation"

This reverts commit 7e7fafe7bf12e01ea661444667fa4c0649275410.