JS loading redesigned
JS loading optimalization