Ported change to the new view. Works great. Need to add the functionality for all the views.