Remove undo+
Fix for cui
Fix path