Now uses the default cancel / add buttons