Fixes #26 - Making the form changes