[Maintenance] Size and text modifications