Refactoring, highlight current playing song, back in files