Fixing slow loading pages

Follow