Replace label class deprecated
Add button class
Merge pull request #299 from FraGoTe/7154

7154