JS Mode and visual tweaks