Complete add and update a bookmark view, view model and data service.
cleanup.