content page refactor fixes