fix roster layout
merge master, roster names