changed css for show page
fixed merge conflicts