#196 Highlight current media in playlist & #195 Code refactory