upadted with more reactive buttons in ui