Refactored slightly so that the same logic is shared between both the
expanded & the collapsed.