Added option to avoid collapsing the last view expanded