v0.9.5 - partial refectoring, fixed spinner visibility