Changed custom_categoires layout
Changed custom_categoires layout - merged conflicts