Added categories, sub-categories and changed layout