DAR-2557, refactor template
DAR-2557, apply styles for new modal layout + refactoring