commit userpage
add newviewpage
merge with James'changes