Used CollectionViews for a better list-management. Used ICommand's with DelegateCommand for better binding in xaml and code-behind. Cleaned up code.