Final color and layout tweaks