Layout adjustments - more cleanup