Adds some html and css
removes merge conflicts