1. Add custom class fields
2. Adjust style issue