Fixes for list view