Cosmetic tweaks to closer match live design
Merge pull request #113 from mr-mr/ccbranch

Cosmetic tweaks to closer match live design