Refactor now_playing segment slightly