Cleaned up forms and request handling
Changed config names