715 modal viewer toc

Please disregard the commit message for the first commit (fd1ddf0). The two commits are the semantic fix, and the non-semantic indentation fix.

For reference, 1704b5d is the parallel (non-indented) fix off of the develop branch.