updated some UI & fix minor bug on display username
Merge branch 'master' of https://github.com/s3287015/wdt_a2