Refactoring some of the html id/name stuff