wip
permissions
fix div issue
Merge branch 'wip'