Added EditFilter menu, and some comments