Fixing bug and improving form type rendered