Added category and tag generators (which need to be extracted later!) and layouts for both.