[FIX] Add the confirmable flag and fix the corresponding views