PShrestha: Additional changes to EditViewController