small tweaks and refactorings
collapsing item on short list bug fix