css for index and show
fixed merge conflict