MAID-526 Update roadmap completion status (also, template cleaning + minor text updates)

Includes Justine's suggested fixes