add scoll behaviour and fixed some issues