scroll & loading issue fixed