Fix #153
Fix #152; change JS load order to load faster