Update User UI and revise some code