new layout partly done