Fix Collapsing issue and add some visuals