updated views, edit/new working