Consolidate waiting page into the answer page