1. Fixed lost state on selected grid items and selected sort order
2. on navigation change the selected items are cleared
3. Moved add category button to the navigation
4. ActionTakers and Controllers changed