better separation between edit and view mode for Organisation and Fop