ALL THE MARKUP

Plus reset/normalize, better hierarchy