Changed the way thumbnails loaded
Merged removeLoading into master
Removed unused imports