Refactor to use same uuid for html classes