[ros-diffs] [dgoette] 396: fix some layout issues spotted by colin