Added width/height attributes