MBH: correcting flow and layout