some changes
fixed style.css conflicts