Layout changes for better color management