Feature/Bug: JS files loading order #893