merged mini
merge from pps
fix show page did not show