small changes
fixed bug about switching pages
Merge branch 'jim-altdesign' into Original
fixed a bug