Update underscore and fix status template