Viewport hotfix added to this branch aswell before i forget it