Redid quite a number of things around tabulation and thumbnails to make it more flexible