Added team editing + misc refactorings
Few layout fixes