Fixed to use button
Fixed to use buttons