FORUM-47 - FORUM-64 | Apply collap/expand container