Improve table and team view