Fixed multiple accordions bug and cleaned up listener