Changed import of settings constants
Fixed scroll fix issue
Removed commented line
Merged