Merge pull request #1726 from leechguy/refactor

[Refactor Branch] Clean up of permission presentation