Many improvement since last commit:
 * change editors logic, make them edit properly
 * some minor UI improvements
 * small usages refactoring