Bluetooth work

Work around bluetooth / UI bugs