updated controls to handle button objects, not implement for controller yet