*Re-implemented using S3SQLCustomForm
Merge pull request #861 from hitesh96db/todos

*Re-implemented using S3SQLCustomForm