Added bugfix from master branch
Added button stuff