Added new loading gif and various cleanups