Fixed layouts, added categories