Merge pull request #29 from chrqls/dev

[#23] Reverting buttons and checkboxes