Fix HB layout

"Fix" HB's new layout