file renames
fix roster layout