Updating Edit view (Issue  #11 #12 ), and some code cleanup