Reworking form request handling to abstract screen handling into its own class