Updates, fixes & html cleanup
Updates, fixes & html cleanup