More work on authorization and UI for it