Re-enabling viewport code; image sizing issues may actually be timing related