Add heightToFit and widthToFit