Changes to list generation and style