Wow! Fix undo button and more origin work