Refactored Environments widgets