#44 working on merging the Devices screen and scenario 1a. Not finished.
Closes #44. The 'Devices' screen is now matchin the design guide.
Merging with branch 'iss44'. Se closing commite message in that issue