Fix remaining issues. Viewport init working