Added some field validations and formatted the index table