bug fixes for mobile and desktop