Some simplification in html for now, also starting on css.