Minify and html fix