Maker/Checker & Permissions UI Improvement