Enchance quality
Added support for pagination display