tracklist modal window + feed views
fix merge conflicts