Add expanded and collapsed to 2 components