Make device friendly and update wording