fixes van list en edit
merge conflicts fixed