Viewport fix - optimizing