refactor html
merge with sean