Fix up header and add bluetooth visibility function