lay-out minor changes