added page thanks and improve forms
fixed second-part