Reformate some modules!

Changed collapse to click a button will close the siblings node