Small lay-out fixxes