new layout is beginning to work