Added titles and category names.  Looks a bit wonky and may need some tuning later