Adding Delete Environment button.
Fixing namings.

Change-Id: I565a7a326c74138fee35aee2c7bd4f7e590bed7a