G's patch for better layout and contrast