UI & confirm page updated