Added some of the original toolbar functions back into the NavToolbar (Issue #26).