Environment name in machine view

Added the environment name to the machine column header and updated the headers to match the new designs. Also removed the provider type from the main header to match the new designs.
`else` goes on this line :)