Enhancement/list view

Fixes and all commits purged into a single one.