Top bar added with 'principal==null' control to switch command