Some changes to the authorization and the UI