Buttone handling

Rebuild because old data was lost on my local machine