Made change to rosters table class name, fixed CSS merge conflict issues, JS still not playing nicely