Improved loading script and styles
Merge Master