Fix width issue and accordion