Buttons renamed into button
Buttons refactored to be a seprate device