changed collapsable to popup