Buttons unlocked after initial draw -CB

Fixing issues with discarding