Refactoring, bugfixes, added ED items tab