Roster layout improved