#236 Fixed history spinner loading + other spinner fixes