fixed css conflicts
fixed show page
merge conflicts