[RG,MK]{refactoring} R1 - Some slight layout changes.