Cleaned up new toolbar integration in the read only viewer.