Simplify and rename the HTML & CSS

Change-Id: I829b7e5acdb058253b1a0a683ab09f0a7f30ee90