Improved the index page performance
Further optimizations