#46 fix and change checkbox to button