Worked on Form Builder formating