Fixed display issues and scroll lag

Refs #1049
Refs #1050