Merge pull request #4 from davidmsantos90/core-refactor

Task #2797 cdb Core refactor
[Task #2797]: Fixed Remove Button