Changes fixed the bluetooth classes and layouts.