added collapsible data and map options