Fix UI (Nhat Request)
Merge branch 'master' of https://github.com/DVLGroup/Project_Wahanda_Alternative