fixed most of the pages after the QA