Improved UI code in index.html
Resolved merge conflicts.