Edit in UI

Changes made during socket.io project that possibly will remain for all
other projects using it.