Added layout to handle categories
Merge remote-tracking branch 'origin/Klim' into NySprint2