seperate layout for devices and clients
Merge branch 'master' of github.com:DjComandos/hackby13drafts