More fixes, enable loading animation

[ci skip]