Revamp team section and top bar section in additional to style improvements