BFB UI changes