DAR-2604, refactoring if UI component and modal class
DAR-2604, fix comment
DAR-2604, code cleanup in modal js
DAR-2604, update function name