MBH: style and layout cleanup