VisLabel added and code clean up