715 modal viewer toc

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