Fix some list grid issues