reorder JS
tweak styles