Move public/private options into simple popover