Basvi-Bug Fixes

Confirm button issue
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design