fixed issues found by page
fixed issues found by page