Added Widget wrapper to wrap input fields
Cleaned up Environment class