WIP - reworking list display