organize index and add index link to show page
resolve merge conflicts