Some fixes for the 'New Team' button
Updated UI
Merge branch 'ui-update' into develop
Merge branch 'develop'