Minor aesthetics tweaks