Minor tweaks to follow proper conventions in ID and Class usage.