Fix width and height issues