Fix undo/redo, fix Collabrify compile error, improve UI