Final small update to handle both desktop and mobile devices