Edit functionality(UI changed)