finished refactoring content page / include code - fixed sort bug