Changed accordion structure