Added some more support for different Resolution