Added FormComponentRenderer for more flexibility for rendering, general code improvements