Final version

only team page need tweeking