Performance improvements + fix HTML deployment