Jian made a few changes in the ui.R