Logic part of category display
Merge pull request #89 from andhieka/working

Logic part of category display