refactoring Custom/Entity Presenter
refactoring UI
remove useless code