lay-out improvements