refined 2 forms and some CSS