Added yshift and None legend support