Merge layout from arnaudbey #43

merge PR from arnaudbey #43