Fix some paddings and wordings