Added second Viewport, cleaned up a little