Further improvements on UI. Exclusion of devices.