cleanup
fixed scroll bug