DeviceSettings: Add up navigation and simplify fix