UI changes to move toggle encrypt to modal dialog