Optimize Policy.yaml readability
Merge branch 'issue/fix-logout-button'