scroll fix
new user
Refactoring