Fixed across all pages, but I think i introduced a new error