Fix removal bug, add edit code feature, UI changes