grid and list views. fixed delete button for categories
fixed merge conflicts