Better form for editing