fixed the css for firefox and html
fixed merge conflict