[POC2-SD] Update some wordings and layouts