Rest of fix for list/grid switch