Fixed some HTML class naming issues, but still more bugs
Minor HTML clean up