Punchlist items for WCIJ

Mostly styling tweaks and improvements per the GDoc.