Updates for criteria

Match new error message display and enable confirmation directive for use on remove