integrating New Viewport Changes

@helgemathee : integrating New Viewport Changes