Code refactoring + drag / remove elements