Improve the page refresh

Fix #38