Tidy up the JS. Break up ContentLoader class into smaller components
Fix conflict