Smarter detection of button creation
0.2.1