reorganized roster layout