added factory, deletion through modal, many improvements