Added percentage width and height back in