refactor html/js/css 2