Refacors accordion some more