Add/Edit view fix