CSS added, HTML slightly improved