Fixing organisation in mesocentre and some details

2 jobs for dev-haefele in 19 seconds (queued for 3 seconds)