Fixed drawing bug causing duplicate elements.
Fixed loading spinner being called too late.