[#2673] Layout fixes.