More template work, Team editing template back online & Small bug fixes