updated HTML/CSS
fix conflict