Modified list layout, still not ready for production