[master 1/8] Rearrange filter.glade the way glade wants it now