some improvements on organization screen