eye in edit users added
eye in edit users position correction
conflicts resolved