refactor
tweak html