Added support for percent in width and height