Added sortAndFilter menu item
Moved source code
First version