Fix some problem when merging code with MinhVu Branch

add one button, fix some error with UI