Always selecting current playing file in the listbox
Refactored
Merge branch 'dev'