Bug fixing

Messaging and device list