-resolves TC-845
-addresses a number of styling concerns from Liz