Add a few more fields and set up scroll hooks