Rainbow layout tweaks