show edit views fixes
merge conflicts in playlist show resolved