added initial loading and fixed scrolling