[#2673] Organisation screen updates.