rename company to team and general restyle