More clean up, refactored the accordion component, but it still needs more work.