minor bugs
Update Delegate
Update view model
Update Viewmodel