Refactored accordionView a bit
Merge branch 'fix-accordionView'