clean up id in html and organize css