Giang commit. Build UI

Using mokup data.
merge conflict
Giang update UI