Added show page
fixed conflicts