Restructure Team editing code as a seperate class
Fix some issues with editing team members