Update with IUnitOfWork Parttern and UI logic changes

Update with IUnitOfWork Parttern and UI logic changes