Add basic html framework code
fix merge