scroll fix
scroll fix and some cleaning