Edits from review; other visual tweaks