Updated latest from bleeding_edge, moved js around.