Made improvement on single page views