refactoring out crappy html/css for custom written html/css
merge