Minor refactoring and fixes.
Sketching 'back' button for device screen.
Testing services for devices and sms.