Indent and javascript tweaks