New MD boost, more layout fixing