Added layout to handle categories
update
merge conflict