Better error handling + layout enhancement for sensors