Changed the way the QA page works