some refactor of dynamicaly created elements