Almost done with UI -CB

Buttons stop working after initial draw