Optimize database control
Modify scroll fix