Device Settings fix and update