Using new layout for new css