improvements to fallover when swiping