Added a SaveAndClose button
Added a prod environment context