fix for layout issue on list view and moving totals
Merge