Fix width issue, change a notice