lots more fixes and cleanup
refactoting list view, etc
first go at CN