Improving layout for BM