Update ProofreadPage to master

Fix 6 major bugs

Change-Id: I1d0d90e72001c0816d45c234f1d855f0e3238045