some reorganization
added some of the html