Enhancement/list view

Fixes and all commits purged into a single one.
You are doing something wrong if this class cannot be made static