Issues fixed with window scroll