Fixes for list layout type