Fixing more mobile/desktop stuff