cleanup and refactoring 2
html a bit structured
build