Fix refresh bug and add some PopUps
Update version