moves all constants to same block. renamed 'Environments' view controller to 'Options'