updated style and html
updated styles and html/fixed conflicts