Minor changes
DataContext plugged in