Fixed categories/index view
Fixed categories/index view - merged changes