Fix widget markup after merge.
Fix milestone markup.