more feed layout cleanup