Edit item

Unfortunately more was pushed to this branch and not only 'edit item' related code.
I tried to make it clear in the commit messages