Updated html IDs to follow - naming conventions.