readded some logic on the show page