fix expand/collapse
fix reload loop on spinner