Working on viewport fix