Added sorting, switched to CDNs when possible