Another round of edits on the main pages