Add improvement to show current/active song