Refactoring the forms
Added default values when drawing from the dict