Fixed repeat/bet on check box error & started building cleaner interface