Add UI changes
Resolved merge conflict