Lots of old uncommitted changes plus a change to improve layout of marklog in categories that don't have associated marks (hides redundant mark/assessment column(s)).