[task] Split category page
[fix] Merge conflict
[task] Nested modal closing
[fix] Merge conflict