Parent category column added
Merge branch 'layout'