Massive Updates to style and html