Use clip Based on Display width and height instead of Internal

As per issue #2