updated the ui
resolved merge conflicts