Updated accordion behaviour