added category view
fixed conflict