Merge "Layout fixes." into devel/master