Edit fix + admin