Fixed so that the application handles rearranging better
Fixed so that deleted nodes are not cached, fixed highlight bug, fixed so that position are not relocated