Added New and Edit controls and views