Bug Fix + New Added Security + Edit Function