Moved some views into the Views dir/group.  Added mode button to InfoBar.