fixed page switching problem and improved router
merge with better-version