Clean

Remove connect button
Add define for radio
Prepare merge