Fixes #50
Add check to ensure at least 1 msg is active
Refactored layout