updated template, added categories and tags