Refactoring
Add id and classes in config + Update Helper