Trying to fix viewport problems