Added team colours, better team display