refactored the page content thing