add "close" button in desctop version
fixed bugs in android
dome
merge origin