All good stuff. I sent this PR a bit early. My bad. I also remembered a few HTML class naming mistakes while driving home. :)  I will review and fix tomorrow.