updated new layout