Pages views improvement