Redo how spinner collapse works
Fix action spinner bugs