Made use of a form builder object instead for better re-use