fixing the page bugs