Use existing folders in advanced new, if possible.
Give admins the EDIT permission for visible items
Merge master into dev_branch