Colors, layout tweaks