Combine category page into index page

Combine category page into index page