Fix list layout (must be improved)