Majoy progress on layout