Added setup and update UI