Reordered JS loading
Updates