Update m4 and m5 with layout