Added collapsible areas to components