Update form setup to be more modern