DAR-719, refactor templates and CSS to support components section