Finish the nested form, type modify and some css work