Work on cleaning up individual page