Better handling of small devices