- added warning message for done/cancel and remove Unit buttons