[#2673] Organisation screen updates.
[#2616] Logout fixes.
[#2612] Layout fixes.