Intermediate commit. Adding HTML code clean up, fixing critical issues.
!Do not update to this revision!