further work on devices page