Add selection feature for non mobile devices. Improve mobile device detection