so many changes
fix show page