Add scroll height fix
Add comments