Improved demo
Improved lists rendering