Improved visualization. Added pagination