[IMP]Improved edit activity logic, keep logic of set values of activity in AddActivity screen itself instead of separate screen