Viewport changes

Implement Issue #25