[IMP] code improvement. form rendering and more.