Fixed scroll & touch bug