Ajay | #3840 | Minor refactoring of Accordion widget