Support folder added + popup form