Tweaks for bluetooth and layout