Working on improving pages