finish the task of c141119-20 from main-repo, update the layout and some variable name