Adding interaction to buttons and doing more UI work