Permissions and save btn fix