Fixing features and context
Changing menu items order
Fixing bug in DBFileItemRepository
Improving layout/menus