Added the From fields
Unnecessary file
Delete pagination