edit _view - Device
Merge branch 'dev'