Viewport aspect ratio fix

@andrewmacp : Not ready to merge yet! 
I just need to make sure the change build on all OSs.