Reorganized NavCanvas to make enabling/disabling toolbar buttons easier