clean up and layout and add html-boilerplate