1st update, most base html should be done