Create new classes and few bottons
Merge origin/master