Improve BO menu