Merge layout from arnaudbey #43