Improved & tested enforcement save view