Refactoring + fixed bugs + cut area + cut element