Implemented new feature collapsing/expansion