Fixing Team/Application pages